fixed collapse, removed tabs