merging in marks changes to functions.php nd fixing layout issue on sub landing page