switch to angular-material and refactoring