Controllers refactoring, full links handling