Change settings button to the account button / logout
Merge branch 'settings-button'