bugfix and better UI experience