Bugs Fixe

Bug fixes + Material Design