Update fixes and UI improvements