More of bootstrap refactoring in various pages