rework the UI and now it feels much better