Display order and insertion of new items now correct after editing list.
Verified insert works correctly
cleaned up a bit more