Configuration panel
Configuration panel fixes