various UI improvements