Move to newer bootstrap, minor style changes