Bootstrap 4 > Fix before merge

Discussions below with issues to fix before bootstrap 4 merge