Rework layout to help people get started and provisioning for #4