updated layout and other bootstrap related integration