some UI fixes #3 :|