Moved lap rendering to Lap method