Tidying up the look, added pagination