Router and form controller changed