entity fixes / image pagepart urlchooser & reordering of form fields