[Custom Sabers] UI cleanup

more stuff still needed!