Revert "Adapting Bootstrap"

This reverts commit 1bcc9d929b5423b7ba6ed64fc915609a4ee0b1ce.
Revert "Revert "Adapting Bootstrap""

This reverts commit dc6e7eaee5e048ff8567cb7204a760564da102d3.