Constants and UI updated