Bug and css fixes