Now saves menu order, some refactoring