This commit is the last version with a tableview. Tableview looks messy and is not an optimal use of this view type.
Merge remote-tracking branch 'origin/master'
Call navigation controller and uiview rather than tableview.