Css updates

Updated CSS layout and added HAML