Added Context Menu items and accepted previous changes