Fix app setup to be standard