updated layout and mixins strategy