enhanced layout integration