Draft: small cleanup in draft menu