updated app with less fixes