more work trying to get layoutmanager working with the latest master