Complete context menu according to spec

Since I was not successful in putting that in original PR