Improved the reordering of tabs
Fixed signature of delegate methods