Master plan to improve navigation in XE