I have to do the same thing myself. Whenever I test out a template it is always messed up too. So following this........