Updated Controllers and Storyboard to support additional functionality components