Buf fixes, UI improvements (material)