Added collapse/expand feature