[UPDATE] Add more missing items/assess options, make them use the same modal file

[MERGE] Resovle merge conflicts

[BUG] Fix nested options