Remove use of material design - return to it later