Added bootstrapping to more pages