Updating UI & Major Improvements