fixed gui with new structure