Fixing ToolBar issue