few UI and UX improvements