Merge "Small tweaks to orientation." into jb-dev