diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1eb7be..5e51fc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.0
+
+- Reworked options to open and copy link #17
+
 ## 2.0.1
 
 - Added missing translations
diff --git a/Migrations/shared-project-timesheets.yaml b/Migrations/shared-project-timesheets.yaml
index fce7acb..6d56bcd 100644
--- a/Migrations/shared-project-timesheets.yaml
+++ b/Migrations/shared-project-timesheets.yaml
@@ -6,5 +6,7 @@
 # bin/console kimai:bundle:shared-project-timesheets:install
 # --------------------------------------------------------------------------------------------------
 
+table_storage:
+  table_name: bundle_migration_shared_project_timesheets
 migrations_paths:
   KimaiPlugin\SharedProjectTimesheetsBundle\Migrations: var/plugins/SharedProjectTimesheetsBundle/Migrations
diff --git a/Resources/translations/messages.de.yaml b/Resources/translations/messages.de.yaml
index 0a5f45d..91ebfcc 100644
--- a/Resources/translations/messages.de.yaml
+++ b/Resources/translations/messages.de.yaml
@@ -4,6 +4,9 @@ shared_project_timesheets:
 
     manage:
         title: Geteilte Projektzeiten
+        open: Öffnen
+        copy: Kopieren
+        copied: Kopiert
         subtitle: Verwalten Sie Ihre geteilten Projektzeiten
         create_link_label: Fügen Sie einen Eintrag hinzu, um Projektzeiten zu teilen
         create:
diff --git a/Resources/translations/messages.en.yaml b/Resources/translations/messages.en.yaml
index 7edbc5a..8dea586 100644
--- a/Resources/translations/messages.en.yaml
+++ b/Resources/translations/messages.en.yaml
@@ -4,6 +4,9 @@ shared_project_timesheets:
 
     manage:
         title: Shared project timesheets
+        open: Open
+        copy: Copy
+        copied: Copied
         subtitle: Manage your shared project timesheets
         create_link_label: Create an entry to share your project timesheets
         create:
diff --git a/Resources/views/manage/index.html.twig b/Resources/views/manage/index.html.twig
index 4a7e4a9..5f05464 100644
--- a/Resources/views/manage/index.html.twig
+++ b/Resources/views/manage/index.html.twig
@@ -33,13 +33,22 @@
             <td class="{{ tables.data_table_column_class(tableName, columns, 'name') }}">{{ sharedProject.project.name }}</td>
             <td class="{{ tables.data_table_column_class(tableName, columns, 'url') }}">
                 {% if sharedProject.shareKey %}
-                    <a href="{{ url('view_shared_project_timesheets', {projectId: sharedProject.project.id, shareKey: sharedProject.shareKey}) }}"
-                       target="_blank">
-                        <i class="fa fa-link"></i>
-                        <span class="hidden-xs hidden-sm hidden-md">
-                            {{ url('view_shared_project_timesheets', {projectId: sharedProject.project.id, shareKey: sharedProject.shareKey}) }}
-                        </span>
-                    </a>
+                    <div class="input-group">
+                        <a class="input-group-addon btn btn-sm btn-default"
+                           href="{{ url('view_shared_project_timesheets', {projectId: sharedProject.project.id, shareKey: sharedProject.shareKey}) }}"
+                           target="_blank">
+                            {{ 'shared_project_timesheets.manage.open' | trans }}
+                        </a>
+                        <input class="form-control input-sm hidden-xs hidden-sm hidden-md"
+                               id="url{{ sharedProject.shareKey }}"
+                               value="{{ url('view_shared_project_timesheets', {projectId: sharedProject.project.id, shareKey: sharedProject.shareKey}) }}"
+                               onclick="select()" readonly/>
+                        <a class="input-group-addon btn btn-sm btn-default copy-btn"
+                           id="btn{{ sharedProject.shareKey }}"
+                           data-clipboard-target="#url{{ sharedProject.shareKey }}">
+                            {{ 'shared_project_timesheets.manage.copy' | trans }}
+                        </a>
+                    </div>
                 {% else %}
                     -
                 {% endif %}
@@ -99,4 +108,39 @@
         padding-bottom: 1rem;
     }
 </style>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+
+{% block javascripts %}
+{{ parent() }}
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.8/clipboard.min.js"
+            integrity="sha512-sIqUEnRn31BgngPmHt2JenzleDDsXwYO+iyvQ46Mw6RL+udAUZj2n/u/PGY80NxRxynO7R9xIGx5LEzw4INWJQ=="
+            crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+    <script type="text/javascript">
+        $(function() {
+            $('.copy-btn').tooltip({
+                trigger: 'manual',
+                placement: 'bottom',
+            });
+
+            var clipboard = new ClipboardJS('.copy-btn');
+            var clipboardTimeouts = {};
+            clipboard.on('success', function(e) {
+                var $el = $(e.trigger);
+                var id = $el.attr("id");
+
+                if (clipboardTimeouts[id]) {
+                    clearTimeout(clipboardTimeouts[id]);
+                    clipboardTimeouts[id] = undefined;
+                }
+
+                $el.attr('data-original-title', '{{ 'shared_project_timesheets.manage.copied' | trans }}')
+                    .tooltip('show');
+
+                clipboardTimeouts[id] = setTimeout(function() {
+                    $el.tooltip('hide');
+                }, 500);
+            });
+        });
+    </script>
+{% endblock %}
diff --git a/composer.json b/composer.json
index b7c4a64..ba5c000 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "Share project timesheets with anyone",
     "homepage": "https://github.com/dexterity42/SharedProjectTimesheetsBundle",
     "type": "kimai-plugin",
-    "version": "2.0.1",
+    "version": "2.1.0",
     "autoload": {
         "psr-4": {
             "KimaiPlugin\\SharedProjectTimesheetsBundle\\": ""
@@ -20,7 +20,7 @@
     "extra": {
         "kimai": {
             "require": "1.15",
-            "version": "2.0.1",
+            "version": "2.1.0",
             "name": "ShareProjectTimesheetsBundle"
         }
     },