refactor margins to work with bootstrap
fix extra small layout problem