Fixing ugly cancel bug, fixed ugly menu code