improve stash popup and commands