UI & Directories updates