some UI improvements