Quick fix to search page and add link page
Merge remote-tracking branch 'origin/UIEnhancementsPlan' into UIEnhancementsPlan