Fixed saving/loading bugs.  Completed and cleaned up various menus