Issue #99 - Fix for various glitches for snapped and portrait view