Updates for UI fixes