Draw the correct row every update

In rapid feature-adding mode, code is getting super buggy :D