More Material Design. Bug Fixes