Battle UI, cards and some cleanup.