fix UI and UX of the app