A refactor to work with bootstrap completely