Improve nav collapsing selection