Enhancements to layout module