ui
commit
many changes. reverts angular-material. fixes #1
merge