UI update and possibly some unnecessary old files