Fixing GUI part2