Some cosmetic changes to GUI here and there.