improvements to assign layout / new ui toolkit