MAJ, refact naming/ add logout