Added pagination
Fixed some small stuff