Refactoring view - add bootstrap components