Feature/collapse

added collapse to the views