Convert radio buttons to menulists in General tab. More reshuffling.