Adds custom fields and rearranges modules