added bootstrap, made some changes