Minor changes, working on adding a tabbed view controller