Updated 404.html as merge from @morgrowe changes