App view WIP: Merge pull requests

Signed-off-by: Jesse Stuart <jesse@jessestuart.ca>