Added new collapse/expand feature