XD-1888: Use 2 tabs for hidden options