Battle popup works! (almost :D) + some fixes