Added 404 page and some fixes