Removed two bugs in onHeaderButton and onFillinButton