Refactor portrait takeover lyaout to be more correct