Now using glade.. Fixed some small stuff..