tidied up ui