Fixes to add buttons to the header element