Add button bar.
Add tabbed pane.
Merge branch 'ui-general-template'