trying to fix nav, updating angular-material to master branch