Main layout cleanup
Cleanups #19

Introduce helper mixin