Updated the app for a better UX