Yay UI upgrade