refactoring
some stuff with material angular