Adding few more tweaks, and 404 page.