Changed labels, added validation