Added a whole bunch of changes to move to bootstrap 3