Added ToolItems, some restructuring