Minor template UI modifications