Reorg/tweak some view templates