Add bootstrap files
Update to new style
Fix merge issues