upgrade to bootstrap 3 and several tweaks