Fix odd/even rows. Remove message type