move roation stuff to edit-level view
merge