Fixed paging

fixed paging, some minor styling chanes