Second strategy to solve #477

We don't loose the classification panel anymore so its state is not lost.

The diff is quite huge mainly because of an indentation change. Basically, I just store the panel in a private field, nothing more.