Update Layout, Fixed Index, Added Pager