ToolbarView logic changed.