Added pagination, fixed formatting