More GUI makeover