Fix: Uniformize menu conditions