Add bootstrap
merge layout changes