Files Manager Improvements #94