Minor layout + css changes