Refactoring code
Edge refactoring updates to address the issue of links not loading at the beginning