Fix up the app