diff --git a/CHANGELOG.md b/CHANGELOG.md
index bcaabcb68a7..6a067c85ac3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,24 @@
-# 2.0.0-RC1  (unreleased)
+# 2.0.0-Beta3 (unreleased)
+
+**RPM / DEB Package changes (to follow HFS)**
+- binary name changed to grafana-server
+- does not install to `/opt/grafana` any more, installs to `/usr/share/grafana`
+- binary to `/usr/sbin/grafana-server`
+- init.d script improvements, renamed to `/etc/init.d/grafana-server`
+- added default file with environment variables,
+  - `/etc/default/grafana-server` (deb/ubuntu)
+  - `/etc/sysconfig/grafana-server` (centos/redhat)
+
+- added systemd service file, tested on debian jessie and centos7
+- config file in same location `/etc/grafana/grafana.ini` (now complete config file but with every setting commented out)
+- data directory (where sqlite3) file is stored is now by default `/var/lib/grafana`
+- no symlinking current to versions anymore
+- For more info see [Issue #1758](https://github.com/grafana/grafana/issues/1758).
+
+**Config breaking change (setting rename)**
+- `[log] root_path` has changed to `[paths] logs`
+
+# 2.0.0-Beta2  (unreleased)
 
 **Enhancements**
 - [Issue #1701](https://github.com/grafana/grafana/issues/1701). Share modal: Override UI theme via URL param for Share link, rendered panel, or embedded panel
diff --git a/public/app/features/panellinkeditor/module.html b/public/app/features/panellinkeditor/module.html
index 4aacb6675fc..7b3020e587e 100644
--- a/public/app/features/panellinkeditor/module.html
+++ b/public/app/features/panellinkeditor/module.html
@@ -2,52 +2,53 @@
   <div class="section">
 		<h5>Drilldown / detail link<tip>These links appear in the dropdown menu in the panel menu. </tip></h5>
 
-		<div class="tight-form" ng-repeat="link in panel.links">
-			<ul class="tight-form-list">
-				<li class="tight-form-item">
-					<i class="fa fa-remove pointer" ng-click="deleteLink(link)"></i>
-				</li>
+		<div ng-repeat="link in panel.links">
+			<div class="tight-form" >
+				<ul class="tight-form-list">
+					<li class="tight-form-item">
+						<i class="fa fa-remove pointer" ng-click="deleteLink(link)"></i>
+					</li>
 
-				<li class="tight-form-item" style="width: 80px;">Link title</li>
-				<li>
-					<input type="text" ng-model="link.title" class="input-medium tight-form-input">
-				</li>
+					<li class="tight-form-item" style="width: 80px;">Link title</li>
+					<li>
+						<input type="text" ng-model="link.title" class="input-medium tight-form-input">
+					</li>
 
-				<li class="tight-form-item">Type</li>
-				<li>
-					<select class="input-medium tight-form-input" style="width: 101px;" ng-model="link.type" ng-options="f for f in ['dashboard','absolute']"></select>
-				</li>
+					<li class="tight-form-item">Type</li>
+					<li>
+						<select class="input-medium tight-form-input" style="width: 101px;" ng-model="link.type" ng-options="f for f in ['dashboard','absolute']"></select>
+					</li>
 
-				<li class="tight-form-item" ng-show="link.type === 'dashboard'">Dashboard</li>
-				<li ng-show="link.type === 'dashboard'">
-					<input type="text"
-					ng-model="link.dashboard"
-					bs-typeahead="searchDashboards"
-					class="input-large tight-form-input">
-				</li>
+					<li class="tight-form-item" ng-show="link.type === 'dashboard'">Dashboard</li>
+					<li ng-show="link.type === 'dashboard'">
+						<input type="text"
+						ng-model="link.dashboard"
+						bs-typeahead="searchDashboards"
+						class="input-large tight-form-input">
+					</li>
 
-				<li class="tight-form-item" ng-show="link.type === 'absolute'">Url</li>
-				<li ng-show="link.type === 'absolute'">
-					<input type="text" ng-model="link.url" class="input-xlarge tight-form-input">
-				</li>
-			</ul>
-			<div class="clearfix"></div>
-		</div>
-
-		<div class="tight-form">
-			<ul class="tight-form-list" role="menu">
-				<li class="tight-form-item">
-					<i class="fa fa-remove invisible"></i>
-				</li>
-				<li class="tight-form-item" style="width: 80px;">
-					Params
-					<tip>Use var-variableName=value to pass templating variables.</tip>
-				</li>
-				<li>
-					<input type="text" ng-model="link.params" class="input-xxlarge tight-form-input">
-				</li>
-			</ul>
-			<div class="clearfix"></div>
+					<li class="tight-form-item" ng-show="link.type === 'absolute'">Url</li>
+					<li ng-show="link.type === 'absolute'">
+						<input type="text" ng-model="link.url" class="input-xlarge tight-form-input">
+					</li>
+				</ul>
+				<div class="clearfix"></div>
+			</div>
+			<div class="tight-form">
+				<ul class="tight-form-list" role="menu">
+					<li class="tight-form-item">
+						<i class="fa fa-remove invisible"></i>
+					</li>
+					<li class="tight-form-item" style="width: 80px;">
+						Params
+						<tip>Use var-variableName=value to pass templating variables.</tip>
+					</li>
+					<li>
+						<input type="text" ng-model="link.params" class="input-xxlarge tight-form-input">
+					</li>
+				</ul>
+				<div class="clearfix"></div>
+			</div>
 		</div>
 
 	</div>