Updating styling and markup to be modular