Add  component #273
Refactor logout to use new  component #273