Fix tabPane issues