Update Layout, Fixed Index, Added Pager
fixed field names
Merge branch 'Hans'

Conflicts:
	index.html
	res/css/styles.css