integrate new name and header. Flow of signin/signout. Reorder forms.

It PR clean the code and add new path for signin/join process.