TitledPanel refactoring, see #61