Refactored base style ready for building out the front end