diff --git a/Makefile b/Makefile
index 9babd843..210c7dd6 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ XGO=GOPATH=$(GOPATH) xgo -go 1.11 --dest=build
 BUILDVERSION=-ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)"
 RICE=$(GOPATH)/bin/rice
 PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH)
-PUBLISH_BODY='{ "request": { "branch": "master", "config": { "env": { "VERSION": "${VERSION}", "COMMIT": "$(TRAVIS_COMMIT)" } } } }'
+PUBLISH_BODY='{ "request": { "branch": "master", "config": { "env": { "VERSION": "$VERSION", "COMMIT": "$(TRAVIS_COMMIT)" } } } }'
 TRAVIS_BUILD_CMD='{ "request": { "branch": "master", "message": "Compile master for Statup v${VERSION}", "config": { "os": [ "linux" ], "language": "go", "go": [ "1.10.x" ], "go_import_path": "github.com/hunterlong/statup", "install": true, "sudo": "required", "services": [ "docker" ], "env": { "VERSION": "${VERSION}" }, "matrix": { "allow_failures": [ { "go": "master" } ], "fast_finish": true }, "before_deploy": [ "git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "make tag" ], "deploy": [ { "provider": "releases", "api_key": "$(GH_TOKEN)", "file": [ "build/statup-osx-x64.tar.gz", "build/statup-osx-x32.tar.gz", "build/statup-linux-x64.tar.gz", "build/statup-linux-x32.tar.gz", "build/statup-linux-arm64.tar.gz", "build/statup-linux-arm7.tar.gz", "build/statup-linux-arm6.tar.gz", "build/statup-linux-alpine.tar.gz", "build/statup-windows-x64.zip" ], "skip_cleanup": true } ], "notifications": { "email": false }, "before_script": ["gem install sass"], "script": [ "travis_wait 30 docker pull karalabe/xgo-latest", "make release" ], "after_success": [], "after_deploy": [ "make publish-dev", "make snapcraft" ] } } }'
 TEST_DIR=$(GOPATH)/src/github.com/hunterlong/statup
 PATH:=$(PATH)
diff --git a/source/tmpl/index.html b/source/tmpl/index.html
index 1227a243..181bd645 100644
--- a/source/tmpl/index.html
+++ b/source/tmpl/index.html
@@ -10,7 +10,7 @@
 
 <div class="col-12 full-col-12">
 
-<div class="list-group online_list">
+<div class="list-group online_list mb-3">
     {{ range Services }}
         <a href="#" class="service_li list-group-item list-group-item-action {{if not .Online}}bg-danger text-white{{ end }}" data-id="{{.Id}}">
         {{ .Name }}
@@ -25,7 +25,7 @@
 </div>
 
 {{ if .Messages }}
-    <div class="col-12 mt-3">
+    <div class="col-12">
     {{range .Messages}}
         <div class="alert alert-primary" role="alert">
             <h3>{{.Title}}</h3>
diff --git a/source/tmpl/services.html b/source/tmpl/services.html
index 4aa1bbaa..fba3e9ae 100644
--- a/source/tmpl/services.html
+++ b/source/tmpl/services.html
@@ -16,7 +16,7 @@
             </thead>
             <tbody class="sortable" id="services_table">
             {{range .}}
-            <tr id="service_{{.Id}}">
+            <tr id="service_{{.Id}}" data-id="{{.Id}}">
                 <td><span class="drag_icon d-none d-md-inline"><i class="fas fa-bars"></i></span> {{.Name}}</td>
                 <td class="d-none d-md-table-cell">{{if .Online}}<span class="badge badge-success">ONLINE</span>{{else}}<span class="badge badge-danger">OFFLINE</span>{{end}} </td>
                 <td class="text-right">
@@ -56,7 +56,8 @@
         var dest = e.detail.destination.items;
         dest.forEach(function(d) {
             i++;
-            var o = {service: parseInt(d.id), order: i}
+            var dId = $(d).attr('data-id');
+            var o = {service: parseInt(dId), order: i};
             newOrder.push(o);
         });
         $.post("/services/reorder", JSON.stringify(newOrder), function(data, status){