Rearranging some table fields