Fix schema and css