Moved 'pages' under 'templates' (share dir)
Tweaked pages templates