WIP - Fixed some of the GTK 2 bugs