new css layout, merged all .css files into style.css, changed/added some classes
merge