fixed errors that was caused by GUI architecture change