layout changes. Simplify toolbar