refactored css/template