diff --git a/interface/src/ui/overlays/Billboardable.cpp b/interface/src/ui/overlays/Billboardable.cpp
index 4ca024f2e5..a125956b5a 100644
--- a/interface/src/ui/overlays/Billboardable.cpp
+++ b/interface/src/ui/overlays/Billboardable.cpp
@@ -41,12 +41,16 @@ bool Billboardable::pointTransformAtCamera(Transform& transform, glm::quat offse
         glm::vec3 cameraPos = qApp->getCamera().getPosition();
         // use the referencial from the avatar, y isn't always up
         glm::vec3 avatarUP = DependencyManager::get<AvatarManager>()->getMyAvatar()->getWorldOrientation()*Vectors::UP;
-        
-        glm::quat rotation(conjugate(toQuat(glm::lookAt(cameraPos, billboardPos, avatarUP))));
-        
-        transform.setRotation(rotation);
-        transform.postRotate(offsetRotation);
-        return true;
+        // check to see if glm::lookAt will work / using glm::lookAt variable name
+		glm::highp_vec3 s(glm::cross(billboardPos - cameraPos, avatarUP));
+
+        // make sure s is not NaN for any component
+        if(glm::length2(s) > 0.0f) {
+            glm::quat rotation(conjugate(toQuat(glm::lookAt(cameraPos, billboardPos, avatarUP))));
+            transform.setRotation(rotation);
+            transform.postRotate(offsetRotation);
+            return true;
+        }
     }
     return false;
 }
diff --git a/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js b/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
index 949fdbb072..a8e30c51a8 100644
--- a/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
+++ b/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
@@ -50,21 +50,29 @@ Script.include("/~/system/libraries/controllers.js");
             return this.hand === RIGHT_HAND ? leftOverlayLaserInput : rightOverlayLaserInput;
         };
 
-        this.isPointingAtWebEntity = function(controllerData) {
+        this.isPointingAtTabletOrWeb = function(controllerData, triggerPressed) {
             var intersection = controllerData.rayPicks[this.hand];
-            var entityProperty = Entities.getEntityProperties(intersection.objectID);
-            var entityType = entityProperty.type;
-            if ((intersection.type === Picks.INTERSECTED_ENTITY && entityType === "Web")) {
-                return true;
+            if (intersection.type === Picks.INTERSECTED_OVERLAY) {
+                var objectID = intersection.objectID;
+                if ((HMD.tabletID && objectID === HMD.tabletID) ||
+					(HMD.tabletScreenID && objectID === HMD.tabletScreenID) || 
+                    (HMD.homeButtonID && objectID === HMD.homeButtonID)) {
+                    return true;
+                } else {
+                    var overlayType = Overlays.getOverlayType(objectID);
+                    if (overlayType === "web3d") {
+                        return true;
+                    }
+                }
+            } else if (intersection.type === Picks.INTERSECTED_ENTITY) {
+                var entityProperty = Entities.getEntityProperties(intersection.objectID);
+                var entityType = entityProperty.type;
+                var isLocked = entityProperty.locked;
+                return entityType === "Web" && (!isLocked || triggerPressed);
             }
             return false;
         };
 
-        this.isPointingAtOverlay = function(controllerData) {
-            var intersection = controllerData.rayPicks[this.hand];
-            return intersection.type === Picks.INTERSECTED_OVERLAY;
-        };
-
         this.deleteContextOverlay = function() {
             var farGrabModule = getEnabledModuleByName(this.hand === RIGHT_HAND
                 ? "RightFarActionGrabEntity" : "LeftFarActionGrabEntity");
@@ -92,10 +100,10 @@ Script.include("/~/system/libraries/controllers.js");
         this.isReady = function(controllerData) {
             var otherModuleRunning = this.getOtherModule().running;
             otherModuleRunning = otherModuleRunning && this.getDominantHand() !== this.hand; // Auto-swap to dominant hand.
-            var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE
-                && controllerData.triggerValues[this.otherHand] <= TRIGGER_OFF_VALUE;
-            if ((!otherModuleRunning || isTriggerPressed)
-                    && (this.isPointingAtOverlay(controllerData) || this.isPointingAtWebEntity(controllerData))) {
+            var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE &&
+                                   controllerData.triggerValues[this.otherHand] <= TRIGGER_OFF_VALUE;
+            var allowThisModule = !otherModuleRunning || isTriggerPressed;
+            if (allowThisModule && this.isPointingAtTabletOrWeb(controllerData, isTriggerPressed)) {
                 this.updateAllwaysOn();
                 if (isTriggerPressed) {
                     this.dominantHandOverride = true; // Override dominant hand.
@@ -113,9 +121,10 @@ Script.include("/~/system/libraries/controllers.js");
             otherModuleRunning = otherModuleRunning && this.getDominantHand() !== this.hand; // Auto-swap to dominant hand.
             otherModuleRunning = otherModuleRunning || this.getOtherModule().dominantHandOverride; // Override dominant hand.
             var grabModuleNeedsToRun = this.grabModuleWantsNearbyOverlay(controllerData);
-            if (!otherModuleRunning && !grabModuleNeedsToRun && (controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE
-                || this.parameters.handLaser.allwaysOn
-                    && (this.isPointingAtOverlay(controllerData) || this.isPointingAtWebEntity(controllerData)))) {
+            var allowThisModule = !otherModuleRunning && !grabModuleNeedsToRun;
+            var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE;
+            var laserOn = isTriggerPressed || this.parameters.handLaser.allwaysOn;
+            if (allowThisModule && (laserOn && this.isPointingAtTabletOrWeb(controllerData, isTriggerPressed))) {
                 this.running = true;
                 return makeRunningValues(true, [], []);
             }