Move options to their own panel