Reverted to old app setup but slight change

Reverted to old app setup but slight change