Refactor of logout button, added new message to action bar