fix the default controller and  refactoring form