Adding encoding UTF-8 and correcting some navigation issues