Moved commenting and other components outside layout