Renamed and some row formatting