Restructured blocks in the templates to make it easier to display flash messages on all pages.