More Storyboard work, along with some formatting in the class files