Add contextMenu and improve login flow