some UI fixes/improvements