Minor changes: Bug due to contextMenu being reloaded