tidied up UI and added data