Scrollbars added to the Subject/Panels panel to make it more tolerant of window resizing (or opening initially with an insufficient size)
Fix merge conflict in git