Updated views and css, cleanup