Server drop-menu update + minor updates