fixed UX a bit