More gui changes