Refactoring the mutliple fields

Improved ordering and improving the rendering of custom fields