more cleanup, move to bootstrap 3