Added bootstrap and adapted layouts
Merge branch 'add_bootstrap'