Html and css refactor