Updated Template and added 404