#450 fix and better UI and UX