More gui improvements
todo