APIGW-613 Fixed minor issue with GUI