Add some classes and remove header template