Further gui improvements