Update table
Merge remote-tracking branch 'origin/master' into 13
Fixing menu