Mostly addresses #582. Additional changes that will need to be made to show.js.coffee are noted in git.