Adding bootstrap and refactoring