More GUI cleaning.