More GUI adjustments