Cleanup HBox and VBox to make them consistent with one another, handle crashing case better.