Feed and Entry pages ready for merge