Update initial post, small polish to layout templates