More category page work