use col-sm classes instead of md
use col-sm classnames
fix styling
Merge remote-tracking branch 'origin/master'