Fix file manager and Push version update to v2.1