work:added bootstrap
work:made edits added icon
work:fixed conflict