Advancing functionality on GTK client, some cleanups as well