Minor clean up of css
Bug fixes, layout cleanup