Lots more HTML refactoring for bootstrap.