Fixed toolbar in items branching, removed patch for data api (only need minor)