Fixed the Join/leave layout bug