Changed Storyboard ID stuff, some UI adjustments