PoE2 Act2 Quest/Map is a mess

Could you rework the Quest and Map system for Act2 in the desert. Between the above ground and below its really hard to keep track were I'm meant to be going to find the next part of the horn. It doesn't help there are 4 quests points at the start.

I've played though 4 times already and always struggle to find my way around act 2.