Minor issues about multiple switchboard rendering fixed