remove text decorations between buttons
escaping fix, mostly seems to be working
turns out I don't need to strip slashes on the way in
Merge branch 'escaping-fix'