More gui improvements