Add images
Remove duplicate fields
Convert from boolean to string
Fix double render
Change field position