diff --git a/po/POTFILES.in b/po/POTFILES.in
index a20489b..df52d24 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,4 +10,5 @@ src/astrognome.c
 [type: gettext/glade]src/resources/ui/astrognome.ui
 [type: gettext/glade]src/resources/ui/ag-window.ui
 [type: gettext/glade]src/resources/ui/ag-preferences.ui
+[type: gettext/glade]src/resources/ui/ag-chart-edit.ui
 astrognome.appdata.xml.in
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index 4862c2d..b194dd5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,6 +34,7 @@ astrognome_source_files = \
 						  ag-display-theme.c  \
 						  ag-icon-view.c      \
 						  ag-chart-renderer.c \
+						  ag-chart-edit.c     \
 						  astrognome.c        \
 						  $(NULL)
 
diff --git a/src/ag-chart-edit.c b/src/ag-chart-edit.c
new file mode 100644
index 0000000..0e9edac
--- /dev/null
+++ b/src/ag-chart-edit.c
@@ -0,0 +1,1060 @@
+#include <math.h>
+#include <string.h>
+#include <swe-glib.h>
+
+#include "config.h"
+#include "ag-chart-edit.h"
+#include "astrognome.h"
+
+typedef struct {
+    GtkWidget          *name;
+    GtkWidget          *country;
+    GtkWidget          *city;
+    GtkWidget          *north_lat;
+    GtkWidget          *south_lat;
+    GtkWidget          *latitude;
+    GtkWidget          *east_long;
+    GtkWidget          *west_long;
+    GtkWidget          *longitude;
+    GtkWidget          *year;
+    GtkWidget          *month;
+    GtkWidget          *day;
+    GtkWidget          *hour;
+    GtkWidget          *minute;
+    GtkWidget          *second;
+    GtkWidget          *timezone;
+
+    GtkAdjustment      *year_adjust;
+
+    GtkEntryCompletion *country_comp;
+    gchar              *selected_country;
+
+    GtkEntryCompletion *city_comp;
+    gchar              *selected_city;
+
+    GtkTextBuffer      *note_buffer;
+} AgChartEditPrivate;
+
+enum {
+    PROP_0,
+    PROP_NAME,
+    PROP_COUNTRY,
+    PROP_CITY,
+    PROP_LONGITUDE,
+    PROP_LATITUDE,
+    PROP_TIMESTAMP,
+    PROP_NOTE,
+    PROP_COUNT
+};
+
+enum {
+    SIGNAL_NAME_CHANGED,
+    SIGNAL_COUNT
+};
+
+struct cc_search {
+    const gchar  *target;
+    GtkTreeIter  *ret_iter;
+    gchar        *ret_code;
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE(AgChartEdit, ag_chart_edit, GTK_TYPE_GRID);
+
+static GParamSpec *properties[PROP_COUNT];
+static guint      signals[SIGNAL_COUNT];
+
+#define GET_PRIV(o) AgChartEditPrivate *priv = ag_chart_edit_get_instance_private((o))
+
+static gboolean
+ag_chart_edit_find_country(GtkTreeModel     *model,
+                       GtkTreePath      *path,
+                       GtkTreeIter      *iter,
+                       struct cc_search *search)
+{
+    gchar    *name,
+             *ccode;
+    gboolean found = FALSE;
+
+    gtk_tree_model_get(
+            model, iter,
+            AG_COUNTRY_NAME, &name,
+            AG_COUNTRY_CODE, &ccode,
+            -1
+        );
+
+    if (g_utf8_collate(search->target, name) == 0) {
+        found = TRUE;
+        search->ret_iter = gtk_tree_iter_copy(iter);
+        search->ret_code = ccode;
+    } else {
+        g_free(ccode);
+    }
+
+    return found;
+}
+
+/**
+ * ag_chart_edit_country_changed_cb:
+ * @country: the #GtkSearchEntry for country search
+ * @chart_edit: the #AgChartEdit in which the event happens
+ *
+ * This function is called whenever the text in the country search entry is
+ * changed.
+ */
+static void
+ag_chart_edit_country_changed_cb(GtkSearchEntry *country,
+                                   AgChartEdit  *chart_edit)
+{
+    struct cc_search search;
+    GET_PRIV(chart_edit);
+
+    search.target   = gtk_entry_get_text(GTK_ENTRY(country));
+    search.ret_iter = NULL;
+
+    gtk_tree_model_foreach(
+            country_list,
+            (GtkTreeModelForeachFunc)ag_chart_edit_find_country,
+            &search
+        );
+
+    g_free(priv->selected_country);
+
+    if (search.ret_iter != NULL) {
+        g_debug("Country (entry-changed): %s", search.ret_code);
+        gtk_tree_iter_free(search.ret_iter);
+        priv->selected_country = search.ret_code;
+    } else {
+        priv->selected_country = NULL;
+    }
+}
+
+static gint
+ag_chart_edit_get_year(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->year));
+}
+
+static gint
+ag_chart_edit_get_month(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->month));
+}
+
+static gint
+ag_chart_edit_get_day(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->day));
+}
+
+static gint
+ag_chart_edit_get_hour(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->hour));
+}
+
+static gint
+ag_chart_edit_get_minute(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->minute));
+}
+
+static gint
+ag_chart_edit_get_second(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->second));
+}
+
+static gdouble
+ag_chart_edit_get_timezone(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->timezone));
+}
+
+void
+ag_chart_edit_set_name(AgChartEdit *chart_edit, const gchar *name)
+{
+    GET_PRIV(chart_edit);
+
+    if (name) {
+        gtk_entry_set_text(GTK_ENTRY(priv->name), name);
+    } else {
+        gtk_entry_set_text(GTK_ENTRY(priv->name), "");
+    }
+}
+
+const gchar *
+ag_chart_edit_get_name(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_entry_get_text(GTK_ENTRY(priv->name));
+}
+
+void
+ag_chart_edit_set_country(AgChartEdit *chart_edit, const gchar *country)
+{
+    GET_PRIV(chart_edit);
+
+    if (country) {
+        gtk_entry_set_text(GTK_ENTRY(priv->country), country);
+    } else {
+        gtk_entry_set_text(GTK_ENTRY(priv->country), "");
+    }
+}
+
+const gchar *
+ag_chart_edit_get_country(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_entry_get_text(GTK_ENTRY(priv->country));
+}
+
+void
+ag_chart_edit_set_city(AgChartEdit *chart_edit, const gchar *city)
+{
+    GET_PRIV(chart_edit);
+
+    if (city) {
+        gtk_entry_set_text(GTK_ENTRY(priv->city), city);
+    } else {
+        gtk_entry_set_text(GTK_ENTRY(priv->city), "");
+    }
+}
+
+const gchar *
+ag_chart_edit_get_city(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    return gtk_entry_get_text(GTK_ENTRY(priv->city));
+}
+
+void
+ag_chart_edit_set_latitude(AgChartEdit *chart_edit, gdouble latitude)
+{
+    GET_PRIV(chart_edit);
+
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->latitude), fabs(latitude));
+
+    if (latitude < 0.0) {
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->south_lat), TRUE);
+    } else {
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->north_lat), TRUE);
+    }
+}
+
+gdouble
+ag_chart_edit_get_latitude(AgChartEdit *chart_edit)
+{
+    gdouble value;
+    GET_PRIV(chart_edit);
+
+    value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->latitude));
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->south_lat))) {
+        value = 0 - value;
+    }
+
+    return value;
+}
+
+void
+ag_chart_edit_set_longitude(AgChartEdit *chart_edit, gdouble longitude)
+{
+    GET_PRIV(chart_edit);
+
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->longitude), fabs(longitude));
+
+    if (longitude < 0.0) {
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->west_long), TRUE);
+    } else {
+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->east_long), TRUE);
+    }
+}
+
+gdouble
+ag_chart_edit_get_longitude(AgChartEdit *chart_edit)
+{
+    gdouble value;
+    GET_PRIV(chart_edit);
+
+    value = gtk_spin_button_get_value(GTK_SPIN_BUTTON(priv->longitude));
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->west_long))) {
+        value = 0 - value;
+    }
+
+    return value;
+}
+
+void
+ag_chart_edit_set_from_timestamp(AgChartEdit *chart_edit,
+                                 GsweTimestamp *timestamp)
+{
+    GET_PRIV(chart_edit);
+
+    gtk_spin_button_set_value(
+            GTK_SPIN_BUTTON(priv->year),
+            (gdouble)gswe_timestamp_get_gregorian_year(timestamp, NULL)
+        );
+
+    gtk_spin_button_set_value(
+            GTK_SPIN_BUTTON(priv->month),
+            (gdouble)gswe_timestamp_get_gregorian_month(timestamp, NULL)
+        );
+
+    gtk_spin_button_set_value(
+            GTK_SPIN_BUTTON(priv->day),
+            (gdouble)gswe_timestamp_get_gregorian_day(timestamp, NULL)
+        );
+
+    gtk_spin_button_set_value(
+            GTK_SPIN_BUTTON(priv->hour),
+            (gdouble)gswe_timestamp_get_gregorian_hour(timestamp, NULL)
+        );
+
+    gtk_spin_button_set_value(
+            GTK_SPIN_BUTTON(priv->minute),
+            (gdouble)gswe_timestamp_get_gregorian_minute(timestamp, NULL)
+        );
+
+    gtk_spin_button_set_value(
+            GTK_SPIN_BUTTON(priv->second),
+            (gdouble)gswe_timestamp_get_gregorian_second(timestamp, NULL)
+        );
+
+    gtk_spin_button_set_value(
+            GTK_SPIN_BUTTON(priv->timezone),
+            gswe_timestamp_get_gregorian_timezone(timestamp)
+        );
+}
+
+/**
+ * ag_chart_edit_get_to_timestamp:
+ * @chart_edit: an #AgChartEdit
+ * @timestamp: if not #NULL, this #GsweTimestamp will be set to the
+ *             timestamp according to @chart_edit’s data
+ *
+ * Returns: (transfer full): if @timestamp was NULL, a new #GsweTimestamp
+ *          object with the timestamp set on @chart_edit. Otherwise, it
+ *          returns @timestamp after modifying it.
+ */
+GsweTimestamp *
+ag_chart_edit_get_to_timestamp(AgChartEdit *chart_edit,
+                               GsweTimestamp *timestamp)
+{
+    GET_PRIV(chart_edit);
+
+    gint  year       = gtk_spin_button_get_value_as_int(
+            GTK_SPIN_BUTTON(priv->year)
+        );
+    guint month      = gtk_spin_button_get_value_as_int(
+            GTK_SPIN_BUTTON(priv->month)
+        ),
+          day        = gtk_spin_button_get_value_as_int(
+            GTK_SPIN_BUTTON(priv->day)
+        ),
+          hour       = gtk_spin_button_get_value_as_int(
+            GTK_SPIN_BUTTON(priv->hour)
+        ),
+          minute     = gtk_spin_button_get_value_as_int(
+            GTK_SPIN_BUTTON(priv->minute)
+        ),
+          second     = gtk_spin_button_get_value_as_int(
+            GTK_SPIN_BUTTON(priv->second)
+        );
+    gdouble timezone = gtk_spin_button_get_value(
+            GTK_SPIN_BUTTON(priv->timezone)
+        );
+
+     if (timestamp && GSWE_IS_TIMESTAMP(timestamp)) {
+        gswe_timestamp_set_gregorian_full(
+                timestamp,
+                year, month, day,
+                hour, minute, second, 0,
+                timezone,
+                NULL
+            );
+
+        return timestamp;
+    } else {
+        return gswe_timestamp_new_from_gregorian_full(
+                year, month, day,
+                hour, minute, second, 0,
+                timezone
+            );
+    }
+}
+
+static void
+ag_chart_edit_dispose(GObject *gobject)
+{
+    G_OBJECT_CLASS(ag_chart_edit_parent_class)->dispose(gobject);
+}
+
+static void
+ag_chart_edit_finalize(GObject *gobject)
+{
+    g_signal_handlers_destroy(gobject);
+    G_OBJECT_CLASS(ag_chart_edit_parent_class)->finalize(gobject);
+}
+
+static void
+ag_chart_edit_set_property(GObject      *gobject,
+                           guint        prop_id,
+                           const GValue *value,
+                           GParamSpec   *pspec)
+{
+    AgChartEdit *chart_edit = AG_CHART_EDIT(gobject);
+
+    switch (prop_id) {
+        case PROP_NAME:
+            ag_chart_edit_set_name(chart_edit, g_value_get_string(value));
+
+            break;
+
+        case PROP_COUNTRY:
+            ag_chart_edit_set_country(chart_edit, g_value_get_string(value));
+
+            break;
+
+        case PROP_CITY:
+            ag_chart_edit_set_city(chart_edit, g_value_get_string(value));
+
+            break;
+
+        case PROP_LONGITUDE:
+            ag_chart_edit_set_longitude(chart_edit, g_value_get_double(value));
+
+            break;
+
+        case PROP_LATITUDE:
+            ag_chart_edit_set_latitude(chart_edit, g_value_get_double(value));
+
+            break;
+
+        case PROP_TIMESTAMP:
+            ag_chart_edit_set_from_timestamp(chart_edit, GSWE_TIMESTAMP(g_value_get_object(value)));
+
+            break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, pspec);
+
+            break;
+    }
+}                           
+
+static void
+ag_chart_edit_get_property(GObject    *gobject, 
+                           guint      prop_id,
+                           GValue     *value,
+                           GParamSpec *pspec)
+{
+    AgChartEdit        *chart_edit = AG_CHART_EDIT(gobject);
+
+    switch (prop_id) {
+        case PROP_NAME:
+            g_value_set_string(value, ag_chart_edit_get_name(chart_edit));
+
+            break;
+
+        case PROP_COUNTRY:
+            g_value_set_string(value, ag_chart_edit_get_country(chart_edit));
+
+            break;
+
+        case PROP_CITY:
+            g_value_set_string(value, ag_chart_edit_get_city(chart_edit));
+
+            break;
+
+        case PROP_LONGITUDE:
+            g_value_set_double(value, ag_chart_edit_get_longitude(chart_edit));
+
+            break;
+
+        case PROP_LATITUDE:
+            g_value_set_double(value, ag_chart_edit_get_latitude(chart_edit));
+
+            break;
+
+        case PROP_TIMESTAMP:
+            g_value_set_object(value, ag_chart_edit_get_to_timestamp(chart_edit, NULL));
+
+            break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, prop_id, pspec);
+
+            break;
+    }
+}
+
+static gboolean
+ag_chart_edit_find_city(GtkTreeModel     *model,
+                        GtkTreePath      *path,
+                        GtkTreeIter      *iter,
+                        struct cc_search *search)
+{
+    gchar    *name,
+             *ccode;
+    gboolean found = FALSE;
+
+    gtk_tree_model_get(
+            model, iter,
+            AG_CITY_NAME, &name,
+            AG_CITY_COUNTRY, &ccode,
+            -1
+        );
+
+    if (g_utf8_collate(search->target, name) == 0) {
+        found = TRUE;
+        search->ret_iter = gtk_tree_iter_copy(iter);
+        search->ret_code = ccode;
+    } else {
+        g_free(ccode);
+    }
+
+    return found;
+}
+
+static void
+ag_chart_edit_city_changed_cb(GtkSearchEntry *city, AgChartEdit *chart_edit)
+{
+    struct cc_search search;
+    GET_PRIV(chart_edit);
+
+    search.target   = gtk_entry_get_text(GTK_ENTRY(city));
+    search.ret_iter = NULL;
+
+    gtk_tree_model_foreach(
+            city_list,
+            (GtkTreeModelForeachFunc)ag_chart_edit_find_city,
+            &search
+        );
+
+    g_free(priv->selected_city);
+
+    if (search.ret_iter != NULL) {
+        gdouble longitude,
+                latitude,
+                altitude;
+        gchar   *name,
+                *ccode;
+
+        gtk_tree_model_get(
+                city_list, search.ret_iter,
+                AG_CITY_COUNTRY, &ccode,
+                AG_CITY_NAME,    &name,
+                AG_CITY_LAT,     &latitude,
+                AG_CITY_LONG,    &longitude,
+                AG_CITY_ALT,     &altitude,
+                -1
+            );
+
+        if (
+                    (priv->selected_country != NULL)
+                    && (strcmp(priv->selected_country, ccode) != 0)
+                ) {
+            return;
+        }
+
+        if (latitude < 0.0) {
+            gtk_toggle_button_set_active(
+                    GTK_TOGGLE_BUTTON(priv->south_lat),
+                    TRUE
+                );
+            gtk_spin_button_set_value(
+                    GTK_SPIN_BUTTON(priv->latitude),
+                    -latitude
+                );
+        } else {
+            gtk_toggle_button_set_active(
+                    GTK_TOGGLE_BUTTON(priv->north_lat),
+                    TRUE
+                );
+            gtk_spin_button_set_value(
+                    GTK_SPIN_BUTTON(priv->latitude),
+                    latitude
+                );
+        }
+
+        if (longitude < 0.0) {
+            gtk_toggle_button_set_active(
+                    GTK_TOGGLE_BUTTON(priv->west_long),
+                    TRUE
+                );
+            gtk_spin_button_set_value(
+                    GTK_SPIN_BUTTON(priv->longitude),
+                    -longitude
+                );
+        } else {
+            gtk_toggle_button_set_active(
+                    GTK_TOGGLE_BUTTON(priv->east_long),
+                    TRUE
+                );
+            gtk_spin_button_set_value(
+                    GTK_SPIN_BUTTON(priv->longitude),
+                    longitude
+                );
+        }
+
+        // TODO: implement setting altitude maybe? Is that really necessary?
+
+        g_debug("City (entry-changed): %s (%s); %.6f, %.6f, %.6f", name, search.ret_code, longitude, latitude, altitude);
+        g_free(name);
+        gtk_tree_iter_free(search.ret_iter);
+        priv->selected_city = search.ret_code;
+    } else {
+        priv->selected_city = NULL;
+    }
+}
+
+static void
+ag_chart_edit_name_changed_cb(GtkEntry *name_entry, AgChartEdit *chart_edit)
+{
+    g_signal_emit(chart_edit, signals[SIGNAL_NAME_CHANGED], 0);
+}
+
+static void
+ag_chart_edit_class_init (AgChartEditClass *klass)
+{
+    GObjectClass   *gobject_class = (GObjectClass *)klass;
+    GtkWidgetClass *widget_class  = GTK_WIDGET_CLASS(klass);
+
+    gobject_class->dispose = ag_chart_edit_dispose;
+    gobject_class->finalize = ag_chart_edit_finalize;
+    gobject_class->set_property = ag_chart_edit_set_property;
+    gobject_class->get_property = ag_chart_edit_get_property;
+
+    signals[SIGNAL_NAME_CHANGED] = g_signal_new(
+            "name-changed",
+            G_TYPE_FROM_CLASS(klass),
+            G_SIGNAL_RUN_FIRST,
+            0, NULL, NULL,
+            g_cclosure_marshal_generic, G_TYPE_NONE, 0
+        );
+
+    properties[PROP_NAME] = g_param_spec_string(
+            "name",
+            "Name",
+            "The person's name",
+            NULL,
+            G_PARAM_STATIC_NICK
+            | G_PARAM_STATIC_NAME
+            | G_PARAM_STATIC_BLURB
+            | G_PARAM_READABLE
+            | G_PARAM_WRITABLE
+        );
+    g_object_class_install_property(
+            gobject_class,
+            PROP_NAME,
+            properties[PROP_NAME]
+        );
+
+    properties[PROP_COUNTRY] = g_param_spec_string(
+            "country",
+            "Country",
+            "Country of birth",
+            NULL,
+            G_PARAM_STATIC_NICK
+            | G_PARAM_STATIC_NAME
+            | G_PARAM_STATIC_BLURB
+            | G_PARAM_READABLE
+            | G_PARAM_WRITABLE
+        );
+    g_object_class_install_property(
+            gobject_class,
+            PROP_COUNTRY,
+            properties[PROP_COUNTRY]
+        );
+
+    properties[PROP_CITY] = g_param_spec_string(
+            "city",
+            "City",
+            "City of birth",
+            NULL,
+            G_PARAM_STATIC_NICK
+            | G_PARAM_STATIC_NAME
+            | G_PARAM_STATIC_BLURB
+            | G_PARAM_READABLE
+            | G_PARAM_WRITABLE
+        );
+    g_object_class_install_property(
+            gobject_class,
+            PROP_CITY,
+            properties[PROP_CITY]
+        );
+
+    properties[PROP_LONGITUDE] = g_param_spec_double(
+            "longitude",
+            "Longitude",
+            "Longitude of birth",
+            -180.0, 180.0,
+            0.0,
+            G_PARAM_STATIC_NICK
+            | G_PARAM_STATIC_NAME
+            | G_PARAM_STATIC_BLURB
+            | G_PARAM_READABLE
+            | G_PARAM_WRITABLE
+        );
+    g_object_class_install_property(
+            gobject_class,
+            PROP_LONGITUDE,
+            properties[PROP_LONGITUDE]
+        );
+
+    properties[PROP_LATITUDE] = g_param_spec_double(
+            "latitude",
+            "Latitude",
+            "Latitude of birth",
+            -90.0, 90.0,
+            0.0,
+            G_PARAM_STATIC_NICK
+            | G_PARAM_STATIC_NAME
+            | G_PARAM_STATIC_BLURB
+            | G_PARAM_READABLE
+            | G_PARAM_WRITABLE
+        );
+    g_object_class_install_property(
+            gobject_class,
+            PROP_LATITUDE,
+            properties[PROP_LATITUDE]
+        );
+
+    properties[PROP_TIMESTAMP] = g_param_spec_object(
+            "timestamp",
+            "Timestamp",
+            "Timestamp of birth",
+            GSWE_TYPE_TIMESTAMP, 
+            G_PARAM_STATIC_NICK
+            | G_PARAM_STATIC_NAME
+            | G_PARAM_STATIC_BLURB
+            | G_PARAM_READABLE
+            | G_PARAM_WRITABLE
+        );
+    g_object_class_install_property(
+            gobject_class,
+            PROP_TIMESTAMP,
+            properties[PROP_TIMESTAMP]
+        );
+
+    properties[PROP_NOTE] = g_param_spec_string(
+            "note",
+            "Note",
+            "Chart notes",
+            NULL,
+            G_PARAM_STATIC_NICK
+            | G_PARAM_STATIC_NAME
+            | G_PARAM_STATIC_BLURB
+            | G_PARAM_READABLE
+            | G_PARAM_WRITABLE
+        );
+    g_object_class_install_property(
+            gobject_class,
+            PROP_NOTE,
+            properties[PROP_NOTE]
+        );
+
+    gtk_widget_class_set_template_from_resource(
+            widget_class,
+            "/eu/polonkai/gergely/Astrognome/ui/ag-chart-edit.ui"
+        );
+
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            name
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            country
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            country_comp
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            city
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            city_comp
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            year
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            month
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            day
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            hour
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            minute
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            second
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            timezone
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            north_lat
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            south_lat
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            east_long
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            west_long
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            latitude
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            longitude
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            year_adjust
+        );
+    gtk_widget_class_bind_template_child_private(
+            widget_class,
+            AgChartEdit,
+            note_buffer
+        );
+
+    gtk_widget_class_bind_template_callback(
+            widget_class,
+            ag_chart_edit_country_changed_cb
+        );
+    gtk_widget_class_bind_template_callback(
+            widget_class,
+            ag_chart_edit_city_changed_cb
+        );
+    gtk_widget_class_bind_template_callback(
+            widget_class,
+            ag_chart_edit_name_changed_cb
+        );
+}
+
+static gboolean
+ag_chart_edit_city_matches(GtkEntryCompletion *city_comp,
+                           const gchar        *key,
+                           GtkTreeIter        *iter,
+                           AgChartEdit        *chart_edit)
+{
+    GET_PRIV(chart_edit);
+    gchar           *ccode,
+                    *name,
+                    *normalized_name,
+                    *case_normalized_name;
+    gboolean        ret = FALSE;
+
+    gtk_tree_model_get(
+            gtk_entry_completion_get_model(city_comp), iter,
+            AG_CITY_NAME,    &name,
+            AG_CITY_COUNTRY, &ccode,
+            -1
+        );
+
+    if (
+                (priv->selected_country == NULL)
+                || (strcmp(priv->selected_country, ccode) == 0)
+            ) {
+        normalized_name = g_utf8_normalize(name, -1, G_NORMALIZE_ALL);
+
+        if (normalized_name) {
+            case_normalized_name = g_utf8_casefold(normalized_name, -1);
+            if (strncmp(key, case_normalized_name, strlen(key)) == 0) {
+                ret = TRUE;
+            }
+
+            g_free(case_normalized_name);
+            g_free(normalized_name);
+        }
+    }
+
+    g_free(name);
+    g_free(ccode);
+
+    return ret;
+}
+
+static void
+ag_chart_edit_init (AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    gtk_widget_init_template(GTK_WIDGET(chart_edit));
+
+    g_object_set(
+            priv->year_adjust,
+            "lower", (gdouble)G_MININT,
+            "upper", (gdouble)G_MAXINT,
+            NULL
+        );
+
+    gtk_entry_completion_set_model(priv->country_comp, country_list);
+    gtk_entry_completion_set_text_column(priv->country_comp, AG_COUNTRY_NAME);
+    gtk_entry_set_completion(GTK_ENTRY(priv->country), priv->country_comp);
+
+    gtk_entry_completion_set_model(priv->city_comp, city_list);
+    gtk_entry_completion_set_text_column(priv->city_comp, AG_CITY_NAME);
+    gtk_entry_completion_set_minimum_key_length(priv->city_comp, 3);
+    gtk_entry_set_completion(GTK_ENTRY(priv->city), priv->city_comp);
+    gtk_entry_completion_set_match_func(
+            priv->city_comp,
+            (GtkEntryCompletionMatchFunc)ag_chart_edit_city_matches,
+            chart_edit,
+            NULL
+        );
+
+}
+
+void
+ag_chart_edit_set_note(AgChartEdit *chart_edit, const gchar *note)
+{
+    GET_PRIV(chart_edit);
+
+    if (note) {
+        // TODO: maybe setting length to -1 here is not that good of an idea…
+        gtk_text_buffer_set_text(priv->note_buffer, note, -1);
+    } else {
+        gtk_text_buffer_set_text(priv->note_buffer, "", 0);
+    }
+}
+
+gchar *
+ag_chart_edit_get_note(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+    GtkTextIter start_iter,
+                end_iter;
+
+    gtk_text_buffer_get_bounds(priv->note_buffer, &start_iter, &end_iter);
+
+    return gtk_text_buffer_get_text(priv->note_buffer, &start_iter, &end_iter, TRUE);
+}
+
+/**
+ * ag_chart_edit_update:
+ * @chart_edit: an #AgChartEdit
+ *
+ * If the current widget is a spin button, force it to update. This is
+ * required when the user enters a new value in a spin button, but
+ * doesn't leave the spin entry before switching tabs with an accel.
+ */
+void
+ag_chart_edit_update(AgChartEdit *chart_edit)
+{
+    GtkWidget *current;
+    GtkWindow *window = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(chart_edit)));
+
+    current = gtk_window_get_focus(window);
+
+    if (GTK_IS_SPIN_BUTTON(current)) {
+        gtk_spin_button_update(GTK_SPIN_BUTTON(current));
+    }
+}
+
+AgDbChartSave *
+ag_chart_edit_get_chart_save(AgChartEdit *chart_edit)
+{
+    AgDbChartSave *edit_data;
+
+    edit_data = ag_db_chart_save_new(TRUE);
+
+    edit_data->name      = g_strdup(ag_chart_edit_get_name(chart_edit));
+    edit_data->country   = g_strdup(ag_chart_edit_get_country(chart_edit));
+    edit_data->city      = g_strdup(ag_chart_edit_get_city(chart_edit));
+    edit_data->longitude = ag_chart_edit_get_longitude(chart_edit);
+    edit_data->latitude  = ag_chart_edit_get_latitude(chart_edit);
+    // TODO: This will cause problems with imported charts
+    edit_data->altitude  = DEFAULT_ALTITUDE;
+    edit_data->year      = ag_chart_edit_get_year(chart_edit);
+    edit_data->month     = ag_chart_edit_get_month(chart_edit);
+    edit_data->day       = ag_chart_edit_get_day(chart_edit);
+    edit_data->hour      = ag_chart_edit_get_hour(chart_edit);
+    edit_data->minute    = ag_chart_edit_get_minute(chart_edit);
+    edit_data->second    = ag_chart_edit_get_second(chart_edit);
+    edit_data->timezone  = ag_chart_edit_get_timezone(chart_edit);
+    edit_data->note      = ag_chart_edit_get_note(chart_edit);
+
+    return edit_data;
+}
+
+void
+ag_chart_edit_clear(AgChartEdit *chart_edit)
+{
+    GET_PRIV(chart_edit);
+
+    /* Empty edit tab values */
+    gtk_entry_set_text(GTK_ENTRY(priv->name), "");
+    gtk_entry_set_text(GTK_ENTRY(priv->country), "");
+    gtk_entry_set_text(GTK_ENTRY(priv->city), "");
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->year), (gdouble)1);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->month), (gdouble)1);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->day), (gdouble)1);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->hour), (gdouble)0);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->minute), (gdouble)0);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->second), (gdouble)0);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->timezone), 0.0);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->north_lat), TRUE);
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->east_long), TRUE);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->longitude), 0.0);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->latitude), 0.0);
+    gtk_text_buffer_set_text(GTK_TEXT_BUFFER(priv->note_buffer), "", 0);
+}
diff --git a/src/ag-chart-edit.h b/src/ag-chart-edit.h
new file mode 100644
index 0000000..087101d
--- /dev/null
+++ b/src/ag-chart-edit.h
@@ -0,0 +1,84 @@
+#ifndef __AG_CHART_EDIT_H__
+#define __AG_CHART_EDIT_H__
+
+#include <gtk/gtk.h>
+
+#include "ag-db.h"
+
+G_BEGIN_DECLS
+
+#define AG_TYPE_CHART_EDIT                                              \
+   (ag_chart_edit_get_type())
+#define AG_CHART_EDIT(obj)                                              \
+   (G_TYPE_CHECK_INSTANCE_CAST ((obj),                                  \
+                                AG_TYPE_CHART_EDIT,                     \
+                                AgChartEdit))
+#define AG_CHART_EDIT_CLASS(klass)                                      \
+   (G_TYPE_CHECK_CLASS_CAST ((klass),                                   \
+                             AG_TYPE_CHART_EDIT,                        \
+                             AgChartEditClass))
+#define IS_AG_CHART_EDIT(obj)                                           \
+   (G_TYPE_CHECK_INSTANCE_TYPE ((obj),                                  \
+                                AG_TYPE_CHART_EDIT))
+#define IS_AG_CHART_EDIT_CLASS(klass)                                   \
+   (G_TYPE_CHECK_CLASS_TYPE ((klass),                                   \
+                             AG_TYPE_CHART_EDIT))
+#define AG_CHART_EDIT_GET_CLASS(obj)                                    \
+   (G_TYPE_INSTANCE_GET_CLASS ((obj),                                   \
+                               AG_TYPE_CHART_EDIT,                      \
+                               AgChartEditClass))
+
+typedef struct _AgChartEdit      AgChartEdit;
+typedef struct _AgChartEditClass AgChartEditClass;
+
+struct _AgChartEditClass
+{
+    GtkGridClass parent_class;
+};
+
+struct _AgChartEdit
+{
+    GtkGrid parent;
+};
+
+GType ag_chart_edit_get_type (void) G_GNUC_CONST;
+
+void ag_chart_edit_set_name(AgChartEdit *chart_edit, const gchar *name);
+
+const gchar *ag_chart_edit_get_name(AgChartEdit *chart_edit);
+
+void ag_chart_edit_set_country(AgChartEdit *chart_edit, const gchar *country);
+
+const gchar *ag_chart_edit_get_country(AgChartEdit *chart_edit);
+
+void ag_chart_edit_set_city(AgChartEdit *chart_edit, const gchar *city);
+
+const gchar *ag_chart_edit_get_city(AgChartEdit *chart_edit);
+
+void ag_chart_edit_set_latitude(AgChartEdit *chart_edit, gdouble latitude);
+
+gdouble ag_chart_edit_get_latitude(AgChartEdit *chart_edit);
+
+void ag_chart_edit_set_longitude(AgChartEdit *chart_edit, gdouble longitude);
+
+gdouble ag_chart_edit_get_longitude(AgChartEdit *chart_edit);
+
+void ag_chart_edit_set_from_timestamp(AgChartEdit   *chart_edit,
+                                      GsweTimestamp *timestamp);
+
+GsweTimestamp *ag_chart_edit_get_to_timestamp(AgChartEdit   *chart_edit,
+                                              GsweTimestamp *timestamp);
+
+void ag_chart_edit_set_note(AgChartEdit *chart_edit, const gchar *note);
+
+gchar *ag_chart_edit_get_note(AgChartEdit *chart_edit);
+
+void ag_chart_edit_update(AgChartEdit *chart_edit);
+
+AgDbChartSave *ag_chart_edit_get_chart_save(AgChartEdit *chart_edit);
+
+void ag_chart_edit_clear(AgChartEdit *chart_edit);
+
+G_END_DECLS
+
+#endif /* __AG_CHART_EDIT_H__ */
diff --git a/src/ag-window.c b/src/ag-window.c
index e0a1b32..709df34 100644
--- a/src/ag-window.c
+++ b/src/ag-window.c
@@ -34,6 +34,7 @@
 #include "ag-db.h"
 #include "ag-display-theme.h"
 #include "ag-icon-view.h"
+#include "ag-chart-edit.h"
 
 struct _AgWindowPrivate {
     GtkWidget     *header_bar;
@@ -41,22 +42,6 @@ struct _AgWindowPrivate {
     GtkWidget     *new_back_stack;
     GtkWidget     *selection_toolbar;
     GtkWidget     *stack;
-    GtkWidget     *name;
-    GtkWidget     *country;
-    GtkWidget     *city;
-    GtkWidget     *north_lat;
-    GtkWidget     *south_lat;
-    GtkWidget     *latitude;
-    GtkWidget     *east_long;
-    GtkWidget     *west_long;
-    GtkWidget     *longitude;
-    GtkWidget     *year;
-    GtkWidget     *month;
-    GtkWidget     *day;
-    GtkWidget     *hour;
-    GtkWidget     *minute;
-    GtkWidget     *second;
-    GtkWidget     *timezone;
     GtkWidget     *house_system;
     GtkWidget     *display_theme;
     GtkWidget     *toolbar_aspect;
@@ -69,29 +54,17 @@ struct _AgWindowPrivate {
     GtkWidget     *aspect_table;
     GtkWidget     *chart_web_view;
     GtkWidget     *points_eq;
-    GtkAdjustment *year_adjust;
 
     GtkWidget     *chart_list;
     AgSettings    *settings;
     AgChart       *chart;
     gboolean      aspect_table_populated;
-    GtkTextBuffer *note_buffer;
     GtkListStore  *house_system_model;
-    AgDbChartSave      *saved_data;
-    GtkEntryCompletion *country_comp;
-    GtkEntryCompletion *city_comp;
-    gchar              *selected_country;
-    gchar              *selected_city;
-    GList              *style_sheets;
-    AgDisplayTheme     *theme;
-    GtkListStore       *display_theme_model;
-    gulong             chart_changed_handler;
-};
-
-struct cc_search {
-    const gchar  *target;
-    GtkTreeIter  *ret_iter;
-    gchar        *ret_code;
+    AgDbChartSave *saved_data;
+    GList         *style_sheets;
+    AgDisplayTheme *theme;
+    GtkListStore   *display_theme_model;
+    gulong         chart_changed_handler;
 };
 
 enum {
@@ -602,8 +575,6 @@ ag_window_set_model_house_system(GtkTreeModel *model,
 void
 ag_window_update_from_chart(AgWindow *window)
 {
-    const gchar     *country,
-                    *city;
     GET_PRIV(window);
     GsweTimestamp   *timestamp   = gswe_moment_get_timestamp(
             GSWE_MOMENT(priv->chart)
@@ -612,74 +583,26 @@ ag_window_update_from_chart(AgWindow *window)
             GSWE_MOMENT(priv->chart)
         );
 
-    if ((country = ag_chart_get_country(priv->chart)) != NULL) {
-        gtk_entry_set_text(
-                GTK_ENTRY(priv->country),
-                ag_chart_get_country(priv->chart)
-            );
-    } else {
-        gtk_entry_set_text(
-                GTK_ENTRY(priv->country),
-                ""
-            );
-    }
-
-    if ((city = ag_chart_get_city(priv->chart)) != NULL) {
-        gtk_entry_set_text(
-                GTK_ENTRY(priv->city),
-                ag_chart_get_city(priv->chart)
-            );
-    } else {
-        gtk_entry_set_text(
-                GTK_ENTRY(priv->city),
-                ""
-            );
-    }
-
-    gtk_spin_button_set_value(
-            GTK_SPIN_BUTTON(priv->year),
-            gswe_timestamp_get_gregorian_year(timestamp, NULL)
+    ag_chart_edit_set_country(
+            AG_CHART_EDIT(priv->tab_edit),
+            ag_chart_get_country(priv->chart)
         );
-    gtk_spin_button_set_value(
-            GTK_SPIN_BUTTON(priv->month),
-            gswe_timestamp_get_gregorian_month(timestamp, NULL)
+    ag_chart_edit_set_city(
+            AG_CHART_EDIT(priv->tab_edit),
+            ag_chart_get_city(priv->chart)
         );
-    gtk_spin_button_set_value(
-            GTK_SPIN_BUTTON(priv->day),
-            gswe_timestamp_get_gregorian_day(timestamp, NULL)
+    ag_chart_edit_set_from_timestamp(
+            AG_CHART_EDIT(priv->tab_edit),
+            timestamp
         );
-    gtk_spin_button_set_value(
-            GTK_SPIN_BUTTON(priv->hour),
-            gswe_timestamp_get_gregorian_hour(timestamp, NULL)
+    ag_chart_edit_set_latitude(
+            AG_CHART_EDIT(priv->tab_edit),
+            coordinates->latitude
         );
-    gtk_spin_button_set_value(
-            GTK_SPIN_BUTTON(priv->minute),
-            gswe_timestamp_get_gregorian_minute(timestamp, NULL)
+    ag_chart_edit_set_longitude(
+            AG_CHART_EDIT(priv->tab_edit),
+            coordinates->longitude
         );
-    gtk_spin_button_set_value(
-            GTK_SPIN_BUTTON(priv->second),
-            gswe_timestamp_get_gregorian_second(timestamp, NULL));
-    gtk_spin_button_set_value(
-            GTK_SPIN_BUTTON(priv->timezone),
-            gswe_timestamp_get_gregorian_timezone(timestamp)
-        );
-    gtk_spin_button_set_value(
-            GTK_SPIN_BUTTON(priv->longitude),
-            fabs(coordinates->longitude)
-        );
-
-    if (coordinates->longitude < 0.0) {
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->west_long), TRUE);
-    }
-
-    gtk_spin_button_set_value(
-            GTK_SPIN_BUTTON(priv->latitude),
-            fabs(coordinates->latitude)
-        );
-
-    if (coordinates->latitude < 0.0) {
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->south_lat), TRUE);
-    }
 
     gtk_tree_model_foreach(
             GTK_TREE_MODEL(priv->house_system_model),
@@ -687,16 +610,15 @@ ag_window_update_from_chart(AgWindow *window)
             window
         );
 
-    gtk_entry_set_text(GTK_ENTRY(priv->name), ag_chart_get_name(priv->chart));
+    ag_chart_edit_set_name(
+            AG_CHART_EDIT(priv->tab_edit),
+            ag_chart_get_name(priv->chart)
+        );
 
-    if (ag_chart_get_note(priv->chart)) {
-        // TODO: maybe setting length to -1 here is not that good of an idea…
-        gtk_text_buffer_set_text(
-                GTK_TEXT_BUFFER(priv->note_buffer),
-                ag_chart_get_note(priv->chart),
-                -1
-            );
-    }
+    ag_chart_edit_set_note(
+            AG_CHART_EDIT(priv->tab_edit),
+            ag_chart_get_note(priv->chart)
+        );
 
     gtk_header_bar_set_subtitle(
             GTK_HEADER_BAR(priv->header_bar),
@@ -721,95 +643,16 @@ ag_window_recalculate_chart(AgWindow *window, gboolean set_everything)
     AgDbChartSave   *edit_data,
                     *chart_data;
     GET_PRIV(window);
-    gboolean        south,
-                    west;
-    GtkTreeIter     house_system_iter;
     GsweHouseSystem house_system;
-    GtkTextIter     start_iter,
-                    end_iter;
     GsweTimestamp   *timestamp;
-    GtkWidget       *current;
     gint            db_id = (priv->saved_data) ? priv->saved_data->db_id : -1;
     AgSettings      *settings;
 
-    south = gtk_toggle_button_get_active(
-            GTK_TOGGLE_BUTTON(priv->south_lat)
-        );
-
-    west      = gtk_toggle_button_get_active(
-            GTK_TOGGLE_BUTTON(priv->west_long)
-        );
-
-    // If the current widget is a spin button, force it to update. This is
-    // required when the user enters a new value in a spin button, but doesn't
-    // leave the spin entry before switching to the chart tab with an accel.
-    current = gtk_window_get_focus(GTK_WINDOW(window));
-
-    if (GTK_IS_SPIN_BUTTON(current)) {
-        gtk_spin_button_update(GTK_SPIN_BUTTON(current));
-    }
-
-    edit_data = ag_db_chart_save_new(TRUE);
+    ag_chart_edit_update(AG_CHART_EDIT(priv->tab_chart));
 
+    edit_data = ag_chart_edit_get_chart_save(AG_CHART_EDIT(priv->tab_edit));
     edit_data->db_id = db_id;
 
-    edit_data->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(priv->name)));
-    edit_data->country = g_strdup(gtk_entry_get_text(GTK_ENTRY(priv->country)));
-    edit_data->city = g_strdup(gtk_entry_get_text(GTK_ENTRY(priv->city)));
-    edit_data->longitude = gtk_spin_button_get_value(
-            GTK_SPIN_BUTTON(priv->longitude)
-        );
-
-    if (west) {
-        edit_data->longitude = - edit_data->longitude;
-    }
-
-    edit_data->latitude = gtk_spin_button_get_value(
-            GTK_SPIN_BUTTON(priv->latitude)
-        );
-
-    if (south) {
-        edit_data->latitude = - edit_data->latitude;
-    }
-
-    // TODO: This will cause problems with imported charts
-    edit_data->altitude = DEFAULT_ALTITUDE;
-    edit_data->year = gtk_spin_button_get_value_as_int(
-            GTK_SPIN_BUTTON(priv->year)
-        );
-    edit_data->month = gtk_spin_button_get_value_as_int(
-            GTK_SPIN_BUTTON(priv->month)
-        );
-    edit_data->day = gtk_spin_button_get_value_as_int(
-            GTK_SPIN_BUTTON(priv->day)
-        );
-    edit_data->hour = gtk_spin_button_get_value_as_int(
-            GTK_SPIN_BUTTON(priv->hour)
-        );
-    edit_data->minute = gtk_spin_button_get_value_as_int(
-            GTK_SPIN_BUTTON(priv->minute)
-        );
-    edit_data->second = gtk_spin_button_get_value_as_int(
-            GTK_SPIN_BUTTON(priv->second)
-        );
-    edit_data->timezone = gtk_spin_button_get_value(
-            GTK_SPIN_BUTTON(priv->timezone)
-        );
-
-    if (!gtk_combo_box_get_active_iter(
-                GTK_COMBO_BOX(priv->house_system),
-                &house_system_iter
-            )) {
-        g_error("House system is not set! This is clearly a bug.");
-    }
-
-    gtk_text_buffer_get_bounds(priv->note_buffer, &start_iter, &end_iter);
-    edit_data->note = gtk_text_buffer_get_text(
-            priv->note_buffer,
-            &start_iter, &end_iter,
-            TRUE
-        );
-
     chart_data = (priv->chart)
             ? ag_chart_get_db_save(priv->chart)
             : NULL
@@ -1608,27 +1451,13 @@ ag_window_new_chart_action(GSimpleAction *action,
     AgWindow        *window = AG_WINDOW(user_data);
     GET_PRIV(window);
 
-    /* Empty edit tab values */
-    gtk_entry_set_text(GTK_ENTRY(priv->name), "");
-    gtk_entry_set_text(GTK_ENTRY(priv->country), "");
-    gtk_entry_set_text(GTK_ENTRY(priv->city), "");
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->year), (gdouble)1);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->month), (gdouble)1);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->day), (gdouble)1);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->hour), (gdouble)1);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->minute), (gdouble)1);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->second), (gdouble)1);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->timezone), 0.0);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->north_lat), TRUE);
-    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->east_long), TRUE);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->longitude), 0.0);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->latitude), 0.0);
+    ag_chart_edit_clear(AG_CHART_EDIT(priv->tab_edit));
+
     gtk_tree_model_foreach(
             GTK_TREE_MODEL(priv->house_system_model),
             (GtkTreeModelForeachFunc)ag_window_set_default_house_system,
             window
         );
-    gtk_text_buffer_set_text(GTK_TEXT_BUFFER(priv->note_buffer), "", 0);
 
     if (priv->chart) {
         ag_app_message_dialog(
@@ -2015,49 +1844,6 @@ ag_window_list_selection_changed_cb(AgIconView *view, AgWindow *window)
     // Here it is possible to set button sensitivity later
 }
 
-static gboolean
-ag_window_city_matches(GtkEntryCompletion *city_comp,
-                       const gchar        *key,
-                       GtkTreeIter        *iter,
-                       AgWindow           *window)
-{
-    GET_PRIV(window);
-    gchar           *ccode,
-                    *name,
-                    *normalized_name,
-                    *case_normalized_name;
-    gboolean        ret = FALSE;
-
-    gtk_tree_model_get(
-            gtk_entry_completion_get_model(city_comp), iter,
-            AG_CITY_NAME,    &name,
-            AG_CITY_COUNTRY, &ccode,
-            -1
-        );
-
-    if (
-                (priv->selected_country == NULL)
-                || (strcmp(priv->selected_country, ccode) == 0)
-            ) {
-        normalized_name = g_utf8_normalize(name, -1, G_NORMALIZE_ALL);
-
-        if (normalized_name) {
-            case_normalized_name = g_utf8_casefold(normalized_name, -1);
-            if (strncmp(key, case_normalized_name, strlen(key)) == 0) {
-                ret = TRUE;
-            }
-
-            g_free(case_normalized_name);
-            g_free(normalized_name);
-        }
-    }
-
-    g_free(name);
-    g_free(ccode);
-
-    return ret;
-}
-
 gboolean
 ag_window_chart_context_cb(WebKitWebView       *web_view,
                            GtkWidget           *default_menu,
@@ -2114,21 +1900,6 @@ ag_window_init(AgWindow *window)
             window
         );
 
-    gtk_entry_completion_set_model(priv->country_comp, country_list);
-    gtk_entry_completion_set_text_column(priv->country_comp, AG_COUNTRY_NAME);
-    gtk_entry_set_completion(GTK_ENTRY(priv->country), priv->country_comp);
-
-    gtk_entry_completion_set_model(priv->city_comp, city_list);
-    gtk_entry_completion_set_text_column(priv->city_comp, AG_CITY_NAME);
-    gtk_entry_completion_set_minimum_key_length(priv->city_comp, 3);
-    gtk_entry_set_completion(GTK_ENTRY(priv->city), priv->city_comp);
-    gtk_entry_completion_set_match_func(
-            priv->city_comp,
-            (GtkEntryCompletionMatchFunc)ag_window_city_matches,
-            window,
-            NULL
-        );
-
     // Fill the house system model and set the combo box on the Edit tab to the
     // default one
     house_system_list = gswe_all_house_systems();
@@ -2182,13 +1953,6 @@ ag_window_init(AgWindow *window)
     gtk_stack_set_visible_child_name(GTK_STACK(priv->stack), "list");
     priv->current_tab = priv->tab_list;
 
-    g_object_set(
-            priv->year_adjust,
-            "lower", (gdouble)G_MININT,
-            "upper", (gdouble)G_MAXINT,
-            NULL
-        );
-
     ag_window_set_chart(window, NULL);
 
     g_action_map_add_action_entries(
@@ -2213,196 +1977,14 @@ ag_window_dispose(GObject *gobject)
 }
 
 static void
-ag_window_name_changed_cb(GtkEntry *name_entry, AgWindow *window)
+ag_window_name_changed_cb(AgChartEdit *chart_edit, AgWindow *window)
 {
-    const gchar     *name;
     GET_PRIV(window);
 
-    name = gtk_entry_get_text(name_entry);
-
-    gtk_header_bar_set_subtitle(GTK_HEADER_BAR(priv->header_bar), name);
-}
-
-static gboolean
-ag_window_find_country(GtkTreeModel     *model,
-                       GtkTreePath      *path,
-                       GtkTreeIter      *iter,
-                       struct cc_search *search)
-{
-    gchar    *name,
-             *ccode;
-    gboolean found = FALSE;
-
-    gtk_tree_model_get(
-            model, iter,
-            AG_COUNTRY_NAME, &name,
-            AG_COUNTRY_CODE, &ccode,
-            -1
+    gtk_header_bar_set_subtitle(
+            GTK_HEADER_BAR(priv->header_bar),
+            ag_chart_edit_get_name(AG_CHART_EDIT(priv->tab_edit))
         );
-
-    if (g_utf8_collate(search->target, name) == 0) {
-        found = TRUE;
-        search->ret_iter = gtk_tree_iter_copy(iter);
-        search->ret_code = ccode;
-    } else {
-        g_free(ccode);
-    }
-
-    return found;
-}
-
-/**
- * ag_window_country_changed_callback:
- * @country: the #GtkSearchEntry for country search
- * @window: the window in which the event happens
- *
- * This function is called whenever the text in the country search entry is
- * changed.
- */
-static void
-ag_window_country_changed_callback(GtkSearchEntry *country, AgWindow *window)
-{
-    struct cc_search search;
-    GET_PRIV(window);
-
-    search.target   = gtk_entry_get_text(GTK_ENTRY(country));
-    search.ret_iter = NULL;
-
-    gtk_tree_model_foreach(
-            country_list,
-            (GtkTreeModelForeachFunc)ag_window_find_country,
-            &search
-        );
-
-    g_free(priv->selected_country);
-
-    if (search.ret_iter != NULL) {
-        g_debug("Country (entry-changed): %s", search.ret_code);
-        gtk_tree_iter_free(search.ret_iter);
-        priv->selected_country = search.ret_code;
-    } else {
-        priv->selected_country = NULL;
-    }
-}
-
-static gboolean
-ag_window_find_city(GtkTreeModel     *model,
-                    GtkTreePath      *path,
-                    GtkTreeIter      *iter,
-                    struct cc_search *search)
-{
-    gchar    *name,
-             *ccode;
-    gboolean found = FALSE;
-
-    gtk_tree_model_get(
-            model, iter,
-            AG_CITY_NAME, &name,
-            AG_CITY_COUNTRY, &ccode,
-            -1
-        );
-
-    if (g_utf8_collate(search->target, name) == 0) {
-        found = TRUE;
-        search->ret_iter = gtk_tree_iter_copy(iter);
-        search->ret_code = ccode;
-    } else {
-        g_free(ccode);
-    }
-
-    return found;
-}
-
-static void
-ag_window_city_changed_callback(GtkSearchEntry *city, AgWindow *window)
-{
-    struct cc_search search;
-    GET_PRIV(window);
-
-    search.target   = gtk_entry_get_text(GTK_ENTRY(city));
-    search.ret_iter = NULL;
-
-    gtk_tree_model_foreach(
-            city_list,
-            (GtkTreeModelForeachFunc)ag_window_find_city,
-            &search
-        );
-
-    g_free(priv->selected_city);
-
-    if (search.ret_iter != NULL) {
-        gdouble longitude,
-                latitude,
-                altitude;
-        gchar   *name,
-                *ccode;
-
-        gtk_tree_model_get(
-                city_list, search.ret_iter,
-                AG_CITY_COUNTRY, &ccode,
-                AG_CITY_NAME,    &name,
-                AG_CITY_LAT,     &latitude,
-                AG_CITY_LONG,    &longitude,
-                AG_CITY_ALT,     &altitude,
-                -1
-            );
-
-        if (
-                    (priv->selected_country != NULL)
-                    && (strcmp(priv->selected_country, ccode) != 0)
-                ) {
-            return;
-        }
-
-        if (latitude < 0.0) {
-            gtk_toggle_button_set_active(
-                    GTK_TOGGLE_BUTTON(priv->south_lat),
-                    TRUE
-                );
-            gtk_spin_button_set_value(
-                    GTK_SPIN_BUTTON(priv->latitude),
-                    -latitude
-                );
-        } else {
-            gtk_toggle_button_set_active(
-                    GTK_TOGGLE_BUTTON(priv->north_lat),
-                    TRUE
-                );
-            gtk_spin_button_set_value(
-                    GTK_SPIN_BUTTON(priv->latitude),
-                    latitude
-                );
-        }
-
-        if (longitude < 0.0) {
-            gtk_toggle_button_set_active(
-                    GTK_TOGGLE_BUTTON(priv->west_long),
-                    TRUE
-                );
-            gtk_spin_button_set_value(
-                    GTK_SPIN_BUTTON(priv->longitude),
-                    -longitude
-                );
-        } else {
-            gtk_toggle_button_set_active(
-                    GTK_TOGGLE_BUTTON(priv->east_long),
-                    TRUE
-                );
-            gtk_spin_button_set_value(
-                    GTK_SPIN_BUTTON(priv->longitude),
-                    longitude
-                );
-        }
-
-        // TODO: implement setting altitude maybe? Is that really necessary?
-
-        g_debug("City (entry-changed): %s (%s); %.6f, %.6f, %.6f", name, search.ret_code, longitude, latitude, altitude);
-        g_free(name);
-        gtk_tree_iter_free(search.ret_iter);
-        priv->selected_city = search.ret_code;
-    } else {
-        priv->selected_city = NULL;
-    }
 }
 
 static void
@@ -2563,72 +2145,6 @@ ag_window_class_init(AgWindowClass *klass)
             AgWindow,
             tab_edit
         );
-    gtk_widget_class_bind_template_child_private(widget_class, AgWindow, name);
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            country
-        );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            country_comp
-        );
-    gtk_widget_class_bind_template_child_private(widget_class, AgWindow, city);
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            city_comp
-        );
-    gtk_widget_class_bind_template_child_private(widget_class, AgWindow, year);
-    gtk_widget_class_bind_template_child_private(widget_class, AgWindow, month);
-    gtk_widget_class_bind_template_child_private(widget_class, AgWindow, day);
-    gtk_widget_class_bind_template_child_private(widget_class, AgWindow, hour);
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            minute
-        );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            second
-        );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            timezone
-        );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            north_lat
-        );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            south_lat
-        );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            east_long
-        );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            west_long
-        );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            latitude
-        );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            longitude
-        );
     gtk_widget_class_bind_template_child_private(
             widget_class,
             AgWindow,
@@ -2649,17 +2165,7 @@ ag_window_class_init(AgWindowClass *klass)
             AgWindow,
             aspect_table
         );
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            year_adjust
-        );
     gtk_widget_class_bind_template_child_private(widget_class, AgWindow, stack);
-    gtk_widget_class_bind_template_child_private(
-            widget_class,
-            AgWindow,
-            note_buffer
-        );
     gtk_widget_class_bind_template_child_private(
             widget_class,
             AgWindow,
@@ -2708,14 +2214,6 @@ ag_window_class_init(AgWindowClass *klass)
             widget_class,
             ag_window_name_changed_cb
         );
-    gtk_widget_class_bind_template_callback(
-            widget_class,
-            ag_window_country_changed_callback
-        );
-    gtk_widget_class_bind_template_callback(
-            widget_class,
-            ag_window_city_changed_callback
-        );
     gtk_widget_class_bind_template_callback(
             widget_class,
             ag_window_display_theme_changed_cb
diff --git a/src/ag.gresource.xml b/src/ag.gresource.xml
index 2c4362e..e9aba42 100644
--- a/src/ag.gresource.xml
+++ b/src/ag.gresource.xml
@@ -4,6 +4,7 @@
     <file>ui/astrognome.ui</file>
     <file>ui/ag-window.ui</file>
     <file>ui/ag-preferences.ui</file>
+    <file>ui/ag-chart-edit.ui</file>
     <file>ui/chart-default.css</file>
     <file>ui/chart-default.xsl</file>
 
diff --git a/src/resources/ui/ag-chart-edit.ui b/src/resources/ui/ag-chart-edit.ui
new file mode 100644
index 0000000..4accbb9
--- /dev/null
+++ b/src/resources/ui/ag-chart-edit.ui
@@ -0,0 +1,495 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkAdjustment" id="latitude_adjust">
+    <property name="upper">90</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">5</property>
+  </object>
+  <object class="GtkAdjustment" id="longitude_adjust">
+    <property name="upper">180</property>
+    <property name="step_increment">0.10000000000000001</property>
+    <property name="page_increment">5</property>
+  </object>
+  <object class="GtkAdjustment" id="year_adjust">
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="month_adjust">
+    <property name="lower">1</property>
+    <property name="upper">12</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="day_adjust">
+    <property name="lower">1</property>
+    <property name="upper">31</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="value">1</property>
+  </object>
+  <object class="GtkAdjustment" id="hour_adjust">
+    <property name="upper">23</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="minute_adjust">
+    <property name="upper">59</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="second_adjust">
+    <property name="upper">61</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="timezone_adjust">
+    <property name="lower">-12</property>
+    <property name="upper">12</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkTextBuffer" id="note_buffer">
+  </object>
+  <object class="GtkEntryCompletion" id="country_comp">
+    <property name="inline_completion">True</property>
+  </object>
+  <object class="GtkEntryCompletion" id="city_comp">
+    <property name="inline_completion">True</property>
+  </object>
+  <template class="AgChartEdit" parent="GtkGrid">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkLabel" id="name_label">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label" translatable="yes">Name</property>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkEntry" id="name">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <signal name="changed" handler="ag_chart_edit_name_changed_cb" object="AgChartEdit" swapped="no"/>
+      </object>
+      <packing>
+        <property name="left_attach">1</property>
+        <property name="top_attach">0</property>
+        <property name="width">2</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="location_frame">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child type="label">
+          <object class="GtkLabel" id="location_frame_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Location</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkGrid" id="location_grid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkLabel" id="country_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Country</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">2</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSearchEntry" id="country">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="primary_icon_name">edit-find-symbolic</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">False</property>
+                <signal name="search-changed" handler="ag_chart_edit_country_changed_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="city_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">City</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSearchEntry" id="city">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="primary_icon_name">edit-find-symbolic</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">False</property>
+                <signal name="search-changed" handler="ag_chart_edit_city_changed_cb" swapped="no"/>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="width">2</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="latitude_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Latitude</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="north_lat">
+                <property name="label" translatable="yes">North</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="south_lat">
+                <property name="label" translatable="yes">South</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">north_lat</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="latitude">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">latitude_adjust</property>
+                <property name="digits">6</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="longitude_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Longitude</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">2</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="east_long">
+                <property name="label" translatable="yes">East</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="west_long">
+                <property name="label" translatable="yes">West</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">east_long</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="longitude">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">longitude_adjust</property>
+                <property name="digits">6</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">4</property>
+                <property name="width">2</property>
+              </packing>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
+        <property name="width">2</property>
+      </packing>
+    </child><!-- location_frame -->
+    <child>
+      <object class="GtkFrame" id="time_frame">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child type="label">
+          <object class="GtkLabel" id="time_frame_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Date and time</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkGrid" id="time_grid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="row_homogeneous">True</property>
+            <property name="column_homogeneous">True</property>
+            <child>
+              <object class="GtkLabel" id="year_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Year</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="year">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">year_adjust</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="month_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Month</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="month">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">month_adjust</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="day_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Day</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="day">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">day_adjust</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="hour_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Hour</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="hour">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">hour_adjust</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="minute_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Minute</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="minute">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">minute_adjust</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="second_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Second</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="second">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">second_adjust</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="timezone_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Timezone</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkSpinButton" id="timezone">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="adjustment">timezone_adjust</property>
+                <property name="digits">1</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+          </object>
+        </child><!-- time_grid -->
+      </object>
+      <packing>
+        <property name="left_attach">2</property>
+        <property name="top_attach">1</property>
+      </packing>
+    </child><!-- time_frame -->
+    <child>
+      <object class="GtkFrame" id="notes_frame">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child type="label">
+          <object class="GtkLabel" id="notes_frame_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">Notes</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="notes_scroll">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="shadow_type">in</property>
+            <property name="min_content_height">300</property>
+            <child>
+              <object class="GtkTextView" id="note">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="buffer">note_buffer</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">2</property>
+        <property name="width">3</property>
+      </packing>
+    </child><!-- notes_frame -->
+  </template>
+</interface>
diff --git a/src/resources/ui/ag-window.ui b/src/resources/ui/ag-window.ui
index 3f116e1..1231d95 100644
--- a/src/resources/ui/ag-window.ui
+++ b/src/resources/ui/ag-window.ui
@@ -57,55 +57,6 @@
       </item>
     </section>
   </menu>
-  <object class="GtkAdjustment" id="latitude_adjust">
-    <property name="upper">90</property>
-    <property name="step_increment">0.10000000000000001</property>
-    <property name="page_increment">5</property>
-  </object>
-  <object class="GtkAdjustment" id="longitude_adjust">
-    <property name="upper">180</property>
-    <property name="step_increment">0.10000000000000001</property>
-    <property name="page_increment">5</property>
-  </object>
-  <object class="GtkAdjustment" id="year_adjust">
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="month_adjust">
-    <property name="lower">1</property>
-    <property name="upper">12</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="value">1</property>
-  </object>
-  <object class="GtkAdjustment" id="day_adjust">
-    <property name="lower">1</property>
-    <property name="upper">31</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="value">1</property>
-  </object>
-  <object class="GtkAdjustment" id="hour_adjust">
-    <property name="upper">23</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="minute_adjust">
-    <property name="upper">59</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="second_adjust">
-    <property name="upper">61</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="timezone_adjust">
-    <property name="lower">-12</property>
-    <property name="upper">12</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkListStore" id="house_system_model">
     <columns>
       <!-- column-name house-system-id -->
@@ -122,14 +73,6 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkTextBuffer" id="note_buffer">
-  </object>
-  <object class="GtkEntryCompletion" id="country_comp">
-    <property name="inline_completion">True</property>
-  </object>
-  <object class="GtkEntryCompletion" id="city_comp">
-    <property name="inline_completion">True</property>
-  </object>
   <template class="AgWindow" parent="GtkApplicationWindow">
     <property name="can_focus">False</property>
     <property name="has_focus">False</property>
@@ -359,439 +302,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkGrid" id="tab_edit">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <child>
-                  <object class="GtkLabel" id="name_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Name</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="name">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <signal name="changed" handler="ag_window_name_changed_cb" object="AgWindow" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="location_frame">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child type="label">
-                      <object class="GtkLabel" id="location_frame_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Location</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkGrid" id="location_grid">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkLabel" id="country_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Country</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">2</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSearchEntry" id="country">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="primary_icon_name">edit-find-symbolic</property>
-                            <property name="primary_icon_activatable">False</property>
-                            <property name="primary_icon_sensitive">False</property>
-                            <signal name="search-changed" handler="ag_window_country_changed_callback" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="city_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">City</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">0</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSearchEntry" id="city">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="primary_icon_name">edit-find-symbolic</property>
-                            <property name="primary_icon_activatable">False</property>
-                            <property name="primary_icon_sensitive">False</property>
-                            <signal name="search-changed" handler="ag_window_city_changed_callback" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="width">2</property>
-                            <property name="height">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="latitude_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Latitude</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="north_lat">
-                            <property name="label" translatable="yes">North</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="south_lat">
-                            <property name="label" translatable="yes">South</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">north_lat</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="latitude">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">latitude_adjust</property>
-                            <property name="digits">6</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="longitude_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Longitude</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="east_long">
-                            <property name="label" translatable="yes">East</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="west_long">
-                            <property name="label" translatable="yes">West</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">east_long</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="longitude">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">longitude_adjust</property>
-                            <property name="digits">6</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">4</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">2</property>
-                  </packing>
-                </child><!-- location_frame -->
-                <child>
-                  <object class="GtkFrame" id="time_frame">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child type="label">
-                      <object class="GtkLabel" id="time_frame_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Date and time</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkGrid" id="time_grid">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="row_homogeneous">True</property>
-                        <property name="column_homogeneous">True</property>
-                        <child>
-                          <object class="GtkLabel" id="year_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Year</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="year">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">year_adjust</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="month_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Month</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="month">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">month_adjust</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="day_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Day</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="day">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">day_adjust</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="hour_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Hour</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="hour">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">hour_adjust</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="minute_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Minute</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="minute">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">minute_adjust</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="second_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Second</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="second">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">second_adjust</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="timezone_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Timezone</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="timezone">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">timezone_adjust</property>
-                            <property name="digits">1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child><!-- time_grid -->
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child><!-- time_frame -->
-                <child>
-                  <object class="GtkFrame" id="notes_frame">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child type="label">
-                      <object class="GtkLabel" id="notes_frame_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Notes</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" id="notes_scroll">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="shadow_type">in</property>
-                        <property name="min_content_height">300</property>
-                        <child>
-                          <object class="GtkTextView" id="note">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="buffer">note_buffer</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                    <property name="width">3</property>
-                  </packing>
-                </child><!-- notes_frame -->
+              <object class="AgChartEdit" id="tab_edit">
+                <signal name="name-changed" handler="ag_window_name_changed_cb" object="AgWindow" swapped="no"/>
               </object>
               <packing>
                 <property name="name">edit</property>