Update app different bugs, improvements