fix / refactor expanding and removing layout list items

TODO
declare topbar broker in init params to split to a seperate concern
leaveList layout_list

cleanup views on fitler
Merge branch 'LayoutsBroker'
Merge branch 'master' into NewLayout