Added further pagination support, fixed ul tags