refactored some styles