Minor gui improvements