Better UX by redirecting to newly added layout
Rename DefaultLayoutContainer and DefaultLayoutTemplate; minor cleanup