diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b107a3f..9d082521 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Enhanced control panel UI with better resize handle positioning for improved user interaction
+
+### Changed
+- Refactored contents control architecture to use base class pattern properly for better code organization
+- Updated all file references and paths to point to single source of truth in capabilities/testdrive-jsui/js/controls/ directory
+
+### Fixed
+- Duplicate file structure issue by eliminating duplicate control files and consolidating to capabilities/ directory
+- Contents panel scrollbar behavior - moved overflow-y: auto to correct container level so scrollbar only spans content area when panel reaches max-height
+
 ### Removed
 - **BREAKING**: Legacy DocumentControls component from TestDrive JSUI plugin system - all control panel functionality now provided by enhanced control panels (ContentsControl, StatusControl, DebugControl, EditControl) with Reset All button functionality moved to EditControl for better maintainability and elimination of code duplication
 
diff --git a/capabilities/testdrive-jsui/js/controls/control-base.js b/capabilities/testdrive-jsui/js/controls/control-base.js
index 35a94d38..f37d52ca 100644
--- a/capabilities/testdrive-jsui/js/controls/control-base.js
+++ b/capabilities/testdrive-jsui/js/controls/control-base.js
@@ -763,17 +763,22 @@ class ControlBase {
             content.innerHTML = `
                 <div class="control-content-container" style="
                     flex: 1;
-                    overflow-y: auto;
+                    display: flex;
+                    flex-direction: column;
                     margin: 0 0 10px 1rem;
                     padding: 0.75rem 1rem 1rem 0;
                     font-size: 0.8rem;
                     box-sizing: border-box;
                     min-height: 0;
                     border-radius: 0 0 6px 6px;
+                    overflow: hidden;
                 ">
                     <div class="control-content-body" style="
+                        flex: 1;
+                        overflow-y: auto;
                         padding: 0;
                         margin-bottom: 0;
+                        min-height: 0;
                     ">
                         ${innerContent}
                     </div>