Bug fixes and css fixes