Mirroring recent changes made to gs.content.layout regarding javascript and baseurl