Fixed bug and edited number of rows