shuffle renumbering done
shuffling was causing weird margins; fixed that