Update to the UI, added discoveryand net  support