Server menu fixes