Update templates view design. Resolves GH-172