Fix ToolBar and Desktop. create toolbar components with enum