updated mixins and layout