 	@IBInspectable public var buttonHeight: Int = 13
 	
 	/**
+	The margin to the top of the disclosure button
+	*/
+	@IBInspectable public var buttonTopMargin: Int = 0
+	
+	/**
 	The margin to the left of the disclosure button
 	*/
-	@IBInspectable public var buttonMargin: Int = 0
+	@IBInspectable public var buttonLeftMargin: Int = 0
 	
 	/**
 	The margin between the the title label and the top of the title view

		// expanding/collapsing
		self.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:|[titleView]|", options: NSLayoutFormatOptions.allZeros, metrics: metrics, views: views))
		self.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:|[expansionView]|", options: NSLayoutFormatOptions.allZeros, metrics: metrics, views: views))
		self.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("V:|-(titleTopMargin)-[titleView]-(titleBottomMargin)-[expansionView]-(0@600)-|", options: NSLayoutFormatOptions.allZeros, metrics: metrics, views: views))

		// the button needs to be constrained to its width and height
		self.titleDisclosureButton.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat("H:[button(==buttonWidth)]", options: NSLayoutFormatOptions.allZeros, metrics: metrics, views: views))

		self.addSubview(self.expansionView)
		
		let metrics = [
			"buttonWidth"        : self.buttonWidth,
			"buttonHeight"       : self.buttonHeight,
			"buttonTopMargin"    : self.buttonTopMargin,
			"buttonLeftMargin"   : self.buttonLeftMargin,
			"titleTopMargin"     : self.titleTopMargin,
			"titleBottomMargin"  : self.titleBottomMargin,
			"titleLeftMargin"    : self.titleLeftMargin,
			"titleRightMargin"   : self.titleRightMargin,
		]
		let views = [
			"titleView"     : self.titleView,
