restructure to remove from toolbar
restructure for rb296 and rb299 support
fixed remaining rb299 issues
fix some cleanup issues
fix action vs label override issue for rb299