Refactoring & Cleanups (Introduce TitledBorder and TitledFolder)