Css improvements and cleanup