diff --git a/templates/400.html b/templates/400.html
deleted file mode 100644
index 0184d44..0000000
--- a/templates/400.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
- {{ template "header" }}
-
-
-
-
400
- Bad Request
-
-
-
-
Boo, looks like a ghost didn't like your request!
-
- But you can try again, type an URL below to shorten it
-
-
-
- {{ template "footer" }}
-
-
\ No newline at end of file
diff --git a/templates/404.html b/templates/404.html
deleted file mode 100644
index be7cd44..0000000
--- a/templates/404.html
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
- {{ template "header" }}
-
-
-
-
-
404
- page not found
-
-
-
-
Boo, looks like a ghost stole this page!
-
- But you can type an URL below to shorten it
-
-
-
- {{ template "footer" }}
-
-
\ No newline at end of file
diff --git a/templates/500.html b/templates/500.html
deleted file mode 100644
index df07b3a..0000000
--- a/templates/500.html
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
- {{ template "header" }}
-
-
-
-
-
500
- Internal server error
-
-
-
-
Boo, the ghost is broken :(
-
- His last words where: {{ . }}
-
-
- {{ template "footer" }}
-
-
\ No newline at end of file
diff --git a/templates/footer.html b/templates/footer.html
deleted file mode 100644
index 9e1b755..0000000
--- a/templates/footer.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ define "footer" }}
-
- html theme by julie ♡
-
-{{ end }}
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
deleted file mode 100644
index b4e2f7b..0000000
--- a/templates/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
- {{ template "slimheader" }}
-
-
-
Welcome to Short, the simple URL shortener,
-
- Type an URL below to shorten it
-
-
- {{ template "footer" }}
-
-
\ No newline at end of file
diff --git a/templates/ok.html b/templates/ok.html
deleted file mode 100644
index ef328cc..0000000
--- a/templates/ok.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- {{ template "slimheader" }}
-
-
- {{ template "footer" }}
-
-
\ No newline at end of file
diff --git a/templates/header.html b/templates/response.html
similarity index 73%
rename from templates/header.html
rename to templates/response.html
index 6b2bb2a..3f0f8a7 100644
--- a/templates/header.html
+++ b/templates/response.html
@@ -1,4 +1,5 @@
-{{ define "header" }}
+
+
Short: the simple url shortener
-{{ end }}
+
+ {{ if eq .IsGhost true }}
+
+
+
{{ .H1 }}
+ {{ .H3 }}
+
+
+
+
+
+ {{ if or (eq .H1 "404") (eq .H1 "400" ) }}
+
+
+ {{ else if eq .H1 "500" }}
+
X
+
X
+ {{ end }}
+ {{ if eq .H1 "404" }}
+
+ {{ else if or ( eq .H1 "400") (eq .H1 "500") }}
+
+ {{ end }}
+
+
+
+
+ {{ end }}
+
+ {{ if eq .IsLink true }}
+
URL Shortened to {{ .Line1 }}
+
+ {{ else }}
+
{{ .Line1 }}
+
+ {{ .Line2 }}
+ {{ end }}
+ {{ if eq .HasForm true }}
+
+ {{ end }}
+
+
+ html theme by julie ♡
+
+
+
\ No newline at end of file
diff --git a/templates/returnPage.html b/templates/returnPage.html
deleted file mode 100644
index f1bcfc0..0000000
--- a/templates/returnPage.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- {{ template "slimheader" }}
-
-
- {{ template "footer" }}
-
-
\ No newline at end of file
diff --git a/templates/slimheader.html b/templates/slimheader.html
deleted file mode 100644
index 21e877e..0000000
--- a/templates/slimheader.html
+++ /dev/null
@@ -1,72 +0,0 @@
-{{ define "slimheader" }}
-
- Short: the simple url shortener
-
-
-{{ end }}
\ No newline at end of file