Fixed a bug with context menu deletion not working properly and adjusted
the width of the switch.