Refining Bootstrap 3 migration #137