Various minor fixes and tweaks to JS/form display