Merge models, layout, css