Small template updates. Requires styling.