Refactored layout by splitting things into mixins