diff --git a/data/ui/dialogs/list_editor.ui b/data/ui/dialogs/list_editor.ui
index 1038798..562239f 100644
--- a/data/ui/dialogs/list_editor.ui
+++ b/data/ui/dialogs/list_editor.ui
@@ -103,7 +103,7 @@
             <property name="revealed">0</property>
             <signal name="response" handler="infobar_response" swapped="no"/>
             <child internal-child="action_area">
-              <object class="GtkButtonBox">
+              <object class="GtkBox">
                 <property name="can_focus">False</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">end</property>
diff --git a/src/API/Attachment.vala b/src/API/Attachment.vala
index 88bc5bb..b45ac21 100644
--- a/src/API/Attachment.vala
+++ b/src/API/Attachment.vala
@@ -4,10 +4,9 @@ public class Tootle.API.Attachment : Entity, Widgetizable {
 	public string kind { get; set; default = "unknown"; }
 	public string url { get; set; }
 	public string? description { get; set; }
-	public string? _preview_url { get; set; }
 	public string? preview_url {
-		set { this._preview_url = value; }
-		get { return (this._preview_url == null || this._preview_url == "") ? url : _preview_url; }
+		set { this.preview_url = value; }
+		get { return (this.preview_url == null || this.preview_url == "") ? url : preview_url; }
 	}
 
 	public File? source_file { get; set; }
diff --git a/src/API/Status.vala b/src/API/Status.vala
index 4f92cdb..a2261c0 100644
--- a/src/API/Status.vala
+++ b/src/API/Status.vala
@@ -28,16 +28,16 @@ public class Tootle.API.Status : Entity, Widgetizable {
     public ArrayList<API.Mention>? mentions { get; set; default = null; }
     public ArrayList<API.Attachment>? media_attachments { get; set; default = null; }
 
-    public string? _url { get; set; }
+    public string? unmodified_url { get; set; }
     public string url {
         owned get { return this.get_modified_url (); }
-        set { this._url = value; }
+        set { this.unmodified_url = value; }
     }
     string get_modified_url () {
-        if (this._url == null) {
+        if (this.unmodified_url == null) {
             return this.uri.replace ("/activity", "");
         }
-        return this._url;
+        return this.unmodified_url;
     }
 
     public Status formal {
diff --git a/src/Application.vala b/src/Application.vala
index 57d0fd7..0e4e5ed 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -151,23 +151,23 @@ namespace Tootle {
 		// 		return false;
 		// }
 
-		void compose_activated () {
+		public void compose_activated () {
 			new Dialogs.Compose ();
 		}
 
-		void back_activated () {
+		public void back_activated () {
 			main_window.back ();
 		}
 
-		void search_activated () {
+		public void search_activated () {
 			main_window.open_view (new Views.Search ());
 		}
 
-		void refresh_activated () {
+		public void refresh_activated () {
 			refresh ();
 		}
 
-		void about_activated () {
+		public void about_activated () {
 			var dialog = new AboutDialog () {
 				transient_for = main_window,
 				modal = true,
diff --git a/src/Dialogs/NewAccount.vala b/src/Dialogs/NewAccount.vala
index 4de74b9..1ef94fb 100644
--- a/src/Dialogs/NewAccount.vala
+++ b/src/Dialogs/NewAccount.vala
@@ -211,7 +211,7 @@ public class Tootle.Dialogs.NewAccount: Adw.Window {
 		if (!deck.child_transition_running && deck.visible_child == instance_step)
 			reset ();
 
-		deck.can_swipe_back = deck.visible_child != done_step;
+		deck.can_navigate_back = deck.visible_child != done_step;
 	}
 
 }
diff --git a/src/Services/Accounts/InstanceAccount.vala b/src/Services/Accounts/InstanceAccount.vala
index ab04dfa..3bafc98 100644
--- a/src/Services/Accounts/InstanceAccount.vala
+++ b/src/Services/Accounts/InstanceAccount.vala
@@ -177,7 +177,7 @@ public class Tootle.InstanceAccount : API.Account, Streamable {
 
 	// Streamable
 
-	public string? _connection_url { get; set; }
+	public string? connection_url { get; set; }
 	public bool subscribed { get; set; }
 
 	public virtual string? get_stream_url () {
diff --git a/src/Services/Network/Streamable.vala b/src/Services/Network/Streamable.vala
index 2dcabd0..9183030 100644
--- a/src/Services/Network/Streamable.vala
+++ b/src/Services/Network/Streamable.vala
@@ -20,7 +20,7 @@ public abstract interface Tootle.Streamable : Object {
 		}
 	}
 
-	public abstract string? _connection_url { get; set; }
+	public abstract string? connection_url { get; set; }
 	public abstract bool subscribed { get; set; default = false; }
 
     public abstract string? get_stream_url ();
@@ -29,14 +29,14 @@ public abstract interface Tootle.Streamable : Object {
     public signal void stream_event (Event ev);
 
 	void subscribe () {
-		streams.unsubscribe (_connection_url, this);
+		streams.unsubscribe (connection_url, this);
 		streams.subscribe (get_stream_url (), this);
-		_connection_url = get_stream_url ();
+		connection_url = get_stream_url ();
 	}
 
 	void unsubscribe () {
 		streams.unsubscribe (get_stream_url (), this);
-		_connection_url = null;
+		connection_url = null;
 	}
 
 	public string get_subscriber_name () {
diff --git a/src/Views/Timeline.vala b/src/Views/Timeline.vala
index 27d79d7..183b5ee 100644
--- a/src/Views/Timeline.vala
+++ b/src/Views/Timeline.vala
@@ -132,7 +132,7 @@ public class Tootle.Views.Timeline : AccountHolder, Streamable, Views.ContentBas
 
 	// Streamable
 
-	public string? _connection_url { get; set; }
+	public string? connection_url { get; set; }
 	public bool subscribed { get; set; }
 
 	protected override void on_streaming_policy_changed () {