Navigation collapse fix 2