Organise fields in admin and add summernote