improved validation on several pages