Restored changes to the application layout (namely, code to display
flash errors) that were lost when the edit-trait branch was merged
into master.