Organized fields. Changed scrollview height for easier dragging.