Improve the current_lang... helpers
Cms page now uses new template