More material design conversion