Cleanup and change 404 message appearance