Open links in new window - 2

Changes after review