WIP refactor layouts