Added collapse/expand icon; Set default to collapse