move some mixins around and make main-app-view share/save layouts