Added some more tweaks to properly handle portrait and landscape