Review and css fixes