Renamed template templates (blown your mind yet?) and added new specific view templates