Refactor login and logout names
Turn close link into icon