New Switches Design

This is a better switches design for the demo page.