Fixed a names getting rearanged after exiting and re-entering the app.