Tweaks to layout mixins