Major layout + css changes