UI improvements on refresh