More working at Battle menu

also fixed some history bugs