move handles into EditMenu

Change-Id: I4b90ef2d197cdd38c0413b6816cdef7dd6bee5ac