BS-6694
Use pencil button instead of a link
Fix layout of cell editor