Added option panel clean-up and wired panel change