User Bug / File Manager

Updates and fixes