GUI overhaul part 2.