New changes to the layout to bootstrap. Issue #118