Further improvements to editing
Refactor the landing layout away from the app layout