url and location fixes
coding style refactor
merge fixes
properly added external icon logic