Enhanced layout