Improved UI with some preconditions and feedback