Validation and router finally fixed