add bootstrap elements and refactor