Fix grid parameter in page templates
Fix comments, code formatting and makup.
No template in Base theme, so move popin on in Demo.
PHP Code Template Update