making error page more useful
converting create view to markup-template
Merge remote-tracking branch 'fork/markup-template' into markup-template