Changed some class names to be more in line with our methodology.  Added some vars, moved layout styles to layout.scss