Ui fixes

added few fixes: Fix discovery compatibility, add proper label in Deployment setting
cc @sseago @ohadlevy