More GUI improvements.