Fixed logout button size issue
Merge branch 'refactor'