Couple fixes in pages