Refactoring and added remove link loading