second page and improvements on index