-marge with ofer
-add public host and port to main frame