Cleanup and add pinch gesture

Switched from table view to normal view controller. Easier to
understand.