Upgrade to bootstrap 3 and some cosmetics