Significant cleanup.
View is no longer throwing errors.
Haven't tested message display view templates.