Changed contenxt menu provider, optimized code