Move fixme to popup