more/better bootstrap, removed obselete classes