Fixed UI/Storyboard Bugs