view and css clean up
merge front_end branch