Starting to work on layout resizing problem, issue #36