Tidied up ui a bit.