Attack type menu fixes