UI Update and UI Functionality Almost Complete