Persistent links, UI cleanups