Added and refactored some styles