Further Handbook page fixes