Site links refactored