added bootstrap, fixed issues