Refactored styling and fixed small inconsistencies