Menu VC nearly complete, login fixed, new protos
fixing merge