Updated UI

Moved buttons
Updated colours
Made the CSS local rather than remote
Display and History tweaks

Added labels and margins to these fields
Merge remote-tracking branch 'origin/UI-Updates'

Conflicts:
	css/theme.css