Restore expanded stated of models/groups in layout, remove some code …

Restore expanded stated of models/groups in layout, remove some code … #3206