s/polymer/angular-material
Cleaned up templates
Minor changes