Material design, bugfixes