Added Expand/Contract buttons