Further tweaks for app