fixed navigation and validation