Added some consistency for layout

There's a bunch of Sass cache in here