Move styling into modules
Update to reflect new style