diff --git a/backend/js/ros_scripts.js b/backend/js/ros_scripts.js
index 4132230..800e1b9 100644
--- a/backend/js/ros_scripts.js
+++ b/backend/js/ros_scripts.js
@@ -7,8 +7,8 @@ ros.recording = false;
 ros.connected = false;
 
 // ros.connectionName = 'ws://192.168.1.105:9090';
-// ros.connectionName = 'ws://localhost:9090';
-ros.connectionName = 'ws://titan.aescape.co:9090';
+ros.connectionName = 'ws://localhost:9090';
+// ros.connectionName = 'ws://titan.aescape.co:9090';
 
 // If there is an error on the backend, an 'error' emit will be emitted.
 ros.on('error', function(error) {
diff --git a/index.html b/index.html
index a1ed4d4..495539f 100644
--- a/index.html
+++ b/index.html
@@ -133,31 +133,25 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
                                 Predefined ROSBridge Connections
                             </div>
                             <div class="panel-body">
-                                <!-- <button id="localhostButton" type="button" onclick="ros.attemptConnection('ws://localhost:9090')" class="btn btn-primary">
+                                <button id="localhostButton" type="button" onclick="ros.attemptConnection('ws://localhost:9090')" class="btn btn-primary">
                                     localhost
                                     <script type="text/javascript">
                                         document.getElementById("ConnectionIPInput").value = ros.connectionName;
                                     </script>
                                 </button>
+                                <button id="TitanButton" type="button" onclick="ros.attemptConnection('ws://titan.local:9090')" class="btn btn-primary">
+                                    Titan
+                                    <script type="text/javascript">
+                                        document.getElementById("ConnectionIPInput").value = ros.connectionName;
+                                    </script>
+                                </button>
                                 <button id="PhoebeButton" type="button" onclick="ros.attemptConnection('ws://phoebe.local:9090')" class="btn btn-primary">
                                     Phoebe
                                     <script type="text/javascript">
                                         document.getElementById("ConnectionIPInput").value = ros.connectionName;
                                     </script>
                                 </button>
-                                <button id="TitanButton" type="button" onclick="ros.attemptConnection('ws://titan.local:9090')" class="btn btn-primary">
-                                    Titan
-                                    <script type="text/javascript">
-                                        document.getElementById("ConnectionIPInput").value = ros.connectionName;
-                                    </script>
-                                </button> -->
-                                <button id="TitanButton" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9090')" class="btn btn-primary">
-                                    Phoebe
-                                    <script type="text/javascript">
-                                        document.getElementById("ConnectionIPInput").value = ros.connectionName;
-                                    </script>
-                                </button>
-                                <button id="RheaButton" type="button" onclick="ros.attemptConnection('ws://titan.aescape.co:9091')" class="btn btn-primary">
+                                <button id="RheaButton" type="button" onclick="ros.attemptConnection('ws://rhea.local:9090')" class="btn btn-primary">
                                     Rhea
                                     <script type="text/javascript">
                                         document.getElementById("ConnectionIPInput").value = ros.connectionName;