material design
bug fixes
code cleaning