added validation + improved html source