Cleaned up controllers and edited table name