UI fixes. Battle continues...