Collapsable refactor

Move assignment of trigger property into button creation method. 
Don't prevent default on click