changed to bootstrap 3.0 + minor improvements