Popup directive, user view refactoring
Remove unused dependiences; refactor