Updates for gtk+-3.0
Tidy up