Add a default layout
Remove tags/code which is not yet valid