Switch to bootstrap 3 and html cleanup