Reorder fields; change range_type widget

Also move some form stuff into the model