Fixing GUI part1