Using GtkGrid instead of GtkTable (deprecated), refactoring