Header and buttons improvements
Header and buttons improvements