Some gui changes