Form cleanup (ongoing)

Some progress here, but I'm fighting to reconcile the Java-generated HTML elements with the new CSS. See commit comments for details.