Some quick UI enhancements