Got rid of ExpandoLayout; integration of new commands