Some more cleanup. Also, added a button for saving re-ordering.