Inner pages templates refactoring