added gui manager
fixed merge