Merged chart changes. FIxed chart header button positioning