material and layout updates