minor changes
Various storyboard changes with constraints and text. Code tidy.