Added missing button element

added button element to button generator and default selector
Merge remote-tracking branch 'origin/Development'