diff --git a/app/routes.py b/app/routes.py
index 06931a9..bdc9b90 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -85,10 +85,10 @@ def wpa(ssid):
         cmd = cmd.replace("*PASSWORD*", form.password.data)
 
         output = subprocess.run(cmd.split(" "), stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.decode("utf-8")
-        if output.find("Error") == -1:
-            return "Successfully connected to {}".format(ssid)
+        if output.find("Error") == -1 and output != "":
+            return render_template("message.html", message="Successfully connected to {}".format(ssid))
 
-        return "Failed to connect to {}".format(ssid)
+        return render_template("message.html", message="Failed to connect to {}".format(ssid))
 
     return render_template("wpa.html", title="WPA Password", form=form)
 
@@ -103,9 +103,9 @@ def connect(ssid, security):
 
     output = subprocess.run(cmd.split(" "), stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.decode("utf-8")
     if output.find("Error") == -1:
-        return "Successfully connected to {}".format(ssid)
+        return render_template("message.html", message="Successfully connected to {}".format(ssid))
 
-    return "Failed to connect to {}".format(ssid)
+    return render_template("message.html", message="Failed to connect to {}".format(ssid))
 
 
 @app.route("/disconnect/<string:ssid>", methods=["GET", "POST"])
@@ -113,6 +113,6 @@ def connect(ssid, security):
 def disconnect(ssid):
     output = subprocess.run(CMD_DISCONNECT.split(" "), stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.decode("utf-8")
     if output.find("successfully disconnected") != -1:
-        return "Successfully Disconnected from {}".format(ssid)
+        return render_template("message.html", message="Sucessfully disconnected from {}".format(ssid))
 
-    return "Failed to Disconnect from {}".format(ssid)
+    return render_template("message.html", message="Failed to Disconnect from {}".format(ssid))
diff --git a/app/templates/message.html b/app/templates/message.html
new file mode 100644
index 0000000..fc49cd1
--- /dev/null
+++ b/app/templates/message.html
@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+
+{% block content %}
+<h2>{{message}}</h2>
+{% endblock %}
\ No newline at end of file