Consolidated css in to style.css and did some minor clean up