integration of gui part
revert some changes of integrated gui