Updated templates to have the same column layout