Reintroduced Bootstrap into the new structure