fixes on the view and the index template