Add (better) portrait mode support. This commit will temporarily break