layout.phtml, some fixes