refactoring; integrating bootstrap