Refactored a small part of the bootstrap rendering