GTK3 upgrade - move from gtk_table to gtk_grid (to be fixed)