SOAP-1416 Minor GUI improvements