Fix layout bugs, misc bugs.

Workaround for a javafx bug, and minor layout changes. Minor bug fixes
as well.