Small UX fixes to make the app smoother