Very partial work on reordering of GUI elements.