Working on switch to material design