Various fixes, aborted attempt at a menu pane.