Initial work to upgrade to the new material design