Changed the Adapter classes and added the right database enquiry to the
activities