Hot fix material design