Merge: GTK clean up and a few new features