diff --git a/src/lib/VueJanus.vue b/src/lib/VueJanus.vue
index 7801da1..d08e7c4 100644
--- a/src/lib/VueJanus.vue
+++ b/src/lib/VueJanus.vue
@@ -107,6 +107,7 @@
                 direction="top"
                 open-on-hover
         >
+
             <template v-slot:activator>
                 <v-btn
                         v-model="fab"
@@ -118,38 +119,71 @@
                     <v-icon v-else>mdi-cog-outline</v-icon>
                 </v-btn>
             </template>
-            <v-btn
-                    fab
-                    dark
-                    small
-                    @click="sharePdf=true"
-            >
-                <v-icon>mdi-pdf-box</v-icon>
-            </v-btn> <v-btn
-                    fab
-                    dark
-                    small
-                    @click="$vuetify.theme.dark=!$vuetify.theme.dark"
-            >
-                <v-icon>mdi-compare</v-icon>
-            </v-btn>
-            <v-btn
-                    fab
-                    dark
-                    small
-
-                    @click="deviceSelectDialog = true"
-            >
-                <v-icon>mdi-camera-outline</v-icon>
-            </v-btn>
-            <v-btn
-                    fab
-                    :dark="!screenShareStarted"
-                    small
-                    @click="screenShareSwitch"
-            >
-                <v-icon>mdi-monitor-screenshot</v-icon>
-            </v-btn>
+
+            <v-tooltip right>
+                <template v-slot:activator="{ on }">
+                    <v-btn
+                        v-on="on"
+                        fab
+                        dark
+                        small
+                        @click="sharePdf=true"
+                    >
+                        <v-icon>mdi-pdf-box</v-icon>
+                    </v-btn> 
+                </template>
+
+                <span>Toggle Share PDF</span>
+            </v-tooltip>
+
+            <v-tooltip right>
+                <template v-slot:activator="{ on }">
+                    <v-btn
+                        v-on="on"
+                        fab
+                        dark
+                        small
+                        @click="$vuetify.theme.dark=!$vuetify.theme.dark"
+                    >
+                        <v-icon>mdi-compare</v-icon>
+                    </v-btn>
+                </template>
+
+                <span>Toggle Theme</span>
+            </v-tooltip>
+            
+            <v-tooltip right>
+                <template v-slot:activator="{ on }">
+                    <v-btn
+                        v-on="on"
+                            fab
+                            dark
+                            small
+
+                            @click="deviceSelectDialog = true"
+                    >
+                        <v-icon>mdi-camera-outline</v-icon>
+                    </v-btn>
+                </template>
+
+                <span>Toggle Camera</span>
+            </v-tooltip>
+            
+            <v-tooltip right>
+                <template v-slot:activator="{ on }">
+                    <v-btn
+                        v-on="on"
+                        fab
+                        :dark="!screenShareStarted"
+                        small
+                        @click="screenShareSwitch"
+                    >
+                        <v-icon>mdi-monitor-screenshot</v-icon>
+                    </v-btn>
+                </template>
+
+                <span>Toggle Share Screen</span>
+            </v-tooltip>
         </v-speed-dial>
     </v-container>
 </template>
@@ -246,7 +280,7 @@
             },
             onlocalstreamScreen (stream) {
                 if(this.screenShareStarted)
-                    this.screenShareStarted=false;
+                    this.screenShareStarted=true;
 
                 this.$refs.ownstreamscreen.srcObject = stream
             },
@@ -272,7 +306,9 @@
                         onlocalstream: this.onlocalstreamScreen
                     }
                 )
-                this.screenShareStarted=true;
+
+                this.mozillaAlert=false;
+                this.chromeAlert=false;
             },
             screenShareStop(){
                 var srcObject=this.$refs.ownstreamscreen.srcObject;
@@ -282,6 +318,8 @@
                 var unpublish = { request: 'unpublish' };
                 this.janusScreenShareHandle.send({ message: unpublish });
                 this.janusScreenShareHandle.detach();
+
+                this.screenShareStarted=false;
             },
             screenShare () {
                 if(!this.$janus.isExtensionEnabled()) {