add rest of fields
fix issue with drag and drop