Removed hack for pop menus because it was breaking a bunch of other stuff