begun conversion to bootstrap 3