Fix collapse button on expandable directive (fix #45)
Simplifying expandable directive code