small changes. Begin to manage Login part