Updated 404 and 500 error pages [MJ-288/MJ-386]

All tests pass.