Second update to the project. Bootstrap and layout