Menu encapsulation. Context concept improvements.