Updated to bootstrap, minor adjustments