Undo popup displays Cancel or Undo... correctly

Actions still not correct. Also partial visibility bug.