Pull request for changes to wyf layout code