Updated view templates to align with each other