Small refactoring bootstrap components