debugged view and controller, some table name changes