missed some imports of removed files
simple style changes to be more in line with bootstrap docs