update to bootstrap 2.3.1 | rearrage some things