move Log Out to menu, refactor Compose