Changes to move away from using a storyboard