Template clean-up, next/prev item added