New layer switcher with layout from David & Tita