Modified to the default template, homepage and samplepage to demonstrate the new flow