Refactor the layout (WIP)