Port over improvements of error page