Merge pull request #149 from singalongwithme/feat/material-design

Feat/material design
Merge pull request #150 from singalongwithme/feat/material-design

Feat/material design
(fix) hopefully