material design, multiple fixes