Moved more styling to modules.