Reverting: accidentally pushed UX improvements changes