FIX: Errors in some menu buttons