Reworked the layout pushing so that viewers don't get new rows