Add some structure to layout