fix / refactor expanding and removing layout list items

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