Minor layout refactoring

r? @metajack