Cust fields

Fixes #854  Custom fields being rearrangeable