Further refactoring
Layouting