Improved TenderController & tender views #8