cleanup, refactor LinkTag, add angular