Removed old states, new toggle logic
Improved appearance of context menu