UI tidy up, using more material theme elements.