Tidy up row numbers/navigation