debugged view and controller, some table name changes
Merge pull request #16 from mdrewt/saturday

debugged view and controller, some table name changes