Fixed nits
Merge pull request #312 from dinhviethoa/306-nits-fixes

context menu cleanup - fixed nits.