some UI fixes