Files Manager Improvements - fixes #94