added return button to editor and fixed bugs