layout changes + css cleanup