Fix some styling for the in-place edit box
Merge branch 'master' into gh-pages