GPII-1035: Refactored styling

Refactored styling to make styles more reusable.