Lots of changes, plus switch to bootstrap
Fix typo