Bug fix
Removed DOM manipulation and linking from controllers