Revert "Tweaks to generated app"

This reverts commit e771dfb1c7ef3c43dabce7deae6a2282c64479de.
Tweaks to generated app