Updated screen based on review and add error 500 page.