refactor and added icon for url's