Views, Templates, VMs fixed