Fixed error page design
Merge origin/master