Layout work for #14, #15, #16
Template cleanup