Playing bootstrap structure for all pages
fixing merge conflict