Move Printing and Editing Bugfix and Simplification