Tidied up UI a bit.