Updated bootstrap

Bootstrap updated 

The rest of the refactor will be made when we got a graphical chart.