updated to bootstrap 3, misc fixes