fix fields sorting issues
add missing submenu
File Field minor fix