Tidied code, seperated into sections for reability
Made entries into single lines
Changed layout
Merge pull request #5 from PaperAndColours/ui-elements

Ui elements