last minute UX fixes