Various updates to layouts to test static templates
Also ignore
Updates to sample code