Cleaned up includes; added glade file