Re-positioning of field options

Signed-off-by: Elliot Condon <e@elliotcondon.com>