Collapse navigation in wide mode
Improve collapser and some other layout changes