No longer add comment makro for layout pages. Removed args for makros, instead we will migrate all. finalizing.