more layers, fix bug in layer switcher