more material design refactoring