some UI fixes #2 :|