Refactoring tests and layouts. Adding bootstrap