Trying to fix up the broken UI links