Removed some stuff from context menu
Some context menu changes