Fixed a few issues affecting insets and offsets in orientations other than portrait.
Potential fix for insets and offsets for landscape without breaking portrait
Cleaned up prior commits slightly