Fixed: GUI cleanup part 4/4.