Refactored css definitions