Fix The login wrapper
Add Legend in Helpers