Handle links better