Revert "Eliminate comment button in modal"

This reverts commit 95d2367fac00973e3238e5b110e08af33e720b33.
Last fix to lock in #68 #359 and #350

Resolves these items with modifications to comment js. Also some clean
up of lines.