implemented
fixed view bug
fixed view
Merge branch 'error_pages'