diff --git a/app/src/main/java/oppen/tva/io/history/Tab.kt b/app/src/main/java/oppen/tva/io/history/Tab.kt
index d5778a3..a3f4691 100644
--- a/app/src/main/java/oppen/tva/io/history/Tab.kt
+++ b/app/src/main/java/oppen/tva/io/history/Tab.kt
@@ -23,16 +23,4 @@ class Tab(val index: Int) {
             }
         }
     }
-
-    fun popHistory(){
-        history.dropLast(1)
-    }
-
-    companion object{
-        fun new(index: Int, address: String): Tab {
-            val tab = Tab(index)
-            tab.add(address)
-            return tab
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/oppen/tva/ui/TvaActivity.kt b/app/src/main/java/oppen/tva/ui/TvaActivity.kt
index e43e2da..ef6e7fc 100644
--- a/app/src/main/java/oppen/tva/ui/TvaActivity.kt
+++ b/app/src/main/java/oppen/tva/ui/TvaActivity.kt
@@ -59,8 +59,12 @@ class TvaActivity : AppCompatActivity() {
     }
 
     private fun renderGemtext(state: TvaState.GeminiResponse) = runOnUiThread {
-        binding.addressEdit.setText(state.uri.toString())
-        adapter.render(state.lines)
+        if(state.header.startsWith("2") && state.header.contains("text/gemini")) {
+            binding.addressEdit.setText(state.uri.toString())
+            adapter.render(state.lines)
+        }else{
+            println("Server returned an error - or non gemtext mimetype: ${state.header}")
+        }
     }
 
     @ExperimentalStdlibApi
diff --git a/app/src/main/java/oppen/tva/ui/gemtext/GemtextAdapter.kt b/app/src/main/java/oppen/tva/ui/gemtext/GemtextAdapter.kt
index cf5b21c..51e97b3 100644
--- a/app/src/main/java/oppen/tva/ui/gemtext/GemtextAdapter.kt
+++ b/app/src/main/java/oppen/tva/ui/gemtext/GemtextAdapter.kt
@@ -39,8 +39,8 @@ class GemtextAdapter(val onLink: (link: URI) -> Unit): RecyclerView.Adapter<Gemt
         return when(viewType){
             typeText -> ViewHolder.Text( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false) )
             typeH1 -> ViewHolder.H1( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h1, parent, false) )
-            typeH2 -> ViewHolder.H1( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h2, parent, false) )
-            typeH3 -> ViewHolder.H1( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h3, parent, false) )
+            typeH2 -> ViewHolder.H2( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h2, parent, false) )
+            typeH3 -> ViewHolder.H3( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_h3, parent, false) )
             typeListItem -> ViewHolder.ListItem( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false) )
             typeLink -> ViewHolder.Link( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_link, parent, false) )
             else -> ViewHolder.Text( LayoutInflater.from(parent.context).inflate(R.layout.gemtext_text, parent, false) )
@@ -66,9 +66,9 @@ class GemtextAdapter(val onLink: (link: URI) -> Unit): RecyclerView.Adapter<Gemt
 
         when(holder){
             is ViewHolder.Text -> holder.itemView.gemtext_text_textview.text = line
-            is ViewHolder.H1 -> holder.itemView.gemtext_text_textview.text = line.substring(2)
-            is ViewHolder.H2 -> holder.itemView.gemtext_text_textview.text = line.substring(3)
-            is ViewHolder.H3 -> holder.itemView.gemtext_text_textview.text = line.substring(4)
+            is ViewHolder.H1 -> holder.itemView.gemtext_text_textview.text = line.substring(2).trim()
+            is ViewHolder.H2 -> holder.itemView.gemtext_text_textview.text = line.substring(3).trim()
+            is ViewHolder.H3 -> holder.itemView.gemtext_text_textview.text = line.substring(4).trim()
             is ViewHolder.ListItem -> holder.itemView.gemtext_text_textview.text = "• ${line.substring(1)}".trim()
             is ViewHolder.Link -> {
                 println("Tva: link: $line")