Fix battle input to make more sense using a predicate,
Use new UI in battle.
Reorder battle UI.
Improve timings for some battle messages.