UI fixes once again.