Fixed some menu state stuff