Controllers refactoring
links fix