Fixed bug introduced in previous 2 commits which broke the device tabs in the rig panels