Refactor layout some more