Some gui improvements