Added validation and changed navigation