UX updated (#7)
