fixed bugs and refactoring
Merge branch 'file-manager-3' of https://github.com/zerovm/zwift-ui into file-manager-3