more cleaning up of the index view