[Custom Sabers] menu changes & fixes