Compelted network menu and some tidying and cosmetic fixes