refactoring based on code review
more code review changes
only show logout and settings outside of menu