lots of changes for bootstrap