added validation, changed format of some pages