tidied up UI