added some modifications to the selections to work well after a pause and when adding new panel