[WIP] Finish layout for desktop and landscape iPad