Thanks for the feedback, Totally agree about the UX. I have pushed a fix and it should be live in some time.