Added pagination
Slight stylistic changes