material design, more fixes