More work on the 2.0 listing page, optimising code