Updated and refactored css