UX cleanup for storyboard