Fixed: GUI cleanup part 1.