UI updates and minor clean job.