Adapted the Tender controller and views to fit the new DB