Refactored some css