Changes show formula editor + merging
Minor changes.