move row count to table caption, clean up