Material design and layout fixes