Fix for add widgets.

Added id to indicator tool.
Categorized indicator to general tool.