Created button blueprint hierachy
A little cleanup
Merge pull request #1110 from PierreFrisch/blueprint