Fix some Bootstrap / Gantry layout issues
Merge pull request #1315 from mahagr/2.0

Fix some Bootstrap / Gantry layout issues