improved switchpanel's design