improve diff popup and commands