Change collapse behavior to improve mobile ux
Merge develop