Added some link/UI related cleanups.