material design + refactoring