Revert "Fixed adding row function, tried to make values calculate dynamically"

This reverts commit a9df0e3bbae2f85560fe5a3cfca4993d800da399.
Revert "Revert "Fixed adding row function, tried to make values calculate dynamically""

This reverts commit bc496143e5effa4c0bf44e336b8f87efb10710a4.
Merge remote-tracking branch 'origin/master'