refactoring after adding boostrap