new mixins and layout lib changes