GUI cleanup part2