Added bootstrap and applied layout to the page
Fixed conflicts with files.