Possible tweaking to layout assignment