Fixed editor issue and popupmenu typo