Refactored out stylus
Tweaks to styling