Added comments and fixed rows height