Adjust UI and UX