minor fixes in current page setting
Adde locale support in link generation