include light id, tweak layout calculation