various UI changes/fixes