#7: Fixed a bunch of build breaks.  The button test *should* work again,
but haven't tried it just yet.
Also added the layout attribute to button, passing that attribute along
to the content pane.
Removed type arguments (diamond operator) and formatted code