Untested: New markup for error page. Closes #104.