diff --git a/PHPCI/Migrations/20151009100610_remove_unique_name_index.php b/PHPCI/Migrations/20151009100610_remove_unique_name_index.php
new file mode 100644
index 00000000..283dfbc0
--- /dev/null
+++ b/PHPCI/Migrations/20151009100610_remove_unique_name_index.php
@@ -0,0 +1,40 @@
+<?php
+
+use Phinx\Migration\AbstractMigration;
+
+class RemoveUniqueNameIndex extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $user = $this->table('user');
+
+        if ($user->hasIndex('name', array('unique' => true))) {
+            $user->removeIndex('name', array('unique' => true));
+            $user->save();
+        }
+
+        $user->addIndex('name', array('unique' => false));
+        $user->save();
+    }
+}
diff --git a/PHPCI/View/User/index.phtml b/PHPCI/View/User/index.phtml
index 15208667..061be90f 100644
--- a/PHPCI/View/User/index.phtml
+++ b/PHPCI/View/User/index.phtml
@@ -40,7 +40,7 @@
                             <td><?php print $status; ?></td>
                             <td>
                                 <?php if($this->User()->getIsAdmin()): ?>
-                                    <div class="btn-group">
+                                    <div class="btn-group pull-right">
                                         <a class="btn btn-default btn-small" href="<?php echo PHPCI_URL ?>user/edit/<?php print $user->getId(); ?>"><?php Lang::out('edit'); ?></a>
                                         <button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
                                             <span class="caret"></span>