Minor cleanup on pages