Continue tidy up of interfaces.

Fix spacing on edit view
Move clear history button to toolbar
Remove segmented control from history view
Remove clear button from history view