Refactored css classes and html hooks