lots of cleanup and css fixes