Added pagination, and did lots more front-end tidying