Changed template structure for bootstrap columns
Merge branch 'template-redesign' into botbot-2.0