Making contextual menu better.