Made layout use main tag for top level content element #24