Fixed saveApps bug and added controls files