Added client/server stuff, merged main menus