Added small and large buttons, button groups
Merged