Mostly app view changes, with minor detailing tweaks