Uh oh. More UI fixes -_-