Switched to bootstrap 3
Various improvements