More Small GUI changes