Updated UX
Part way through improving UX