Feature/panel updates