fixed saving bug

and introduced menu-follows-focus behavior