Add club bar and correct segment collection