Add 404 page
Small template cleanup