Added new layout and custom error page