cleanup and activity bar button working