Moved buttons into header bar
Moved buttons into header bar