Modified controller and models to display the lists correctly