add little i18n support for pages and little fix for issue