Working on material design and some other changes.