GTK updates

This is Nikki's work.