Fixed GUI, other QoLfixes