[basetemplate] Components should still be inside the content column (closes #4002583) [applied]