switched from Interface Builder to Storyboard, more method renaming and refactoring