Styling mostly done, need to tidy up the code