Finish validations + improve navigation