More GUI upgrades