Cart Toolbar refactoring