Refactoring of Links completed Still to do LangugeType Dropdown.