[Core] Removed ToolbarGuard remnants.
[Core] Properly update index & show toolbar on addition.